Merge branch 'release-0.9.7'

[Sone.git] / src / main / java / net / pterodactylus / sone / template / SubstringFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
index 005eb1f..f14d0ff 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SubstringFilter.java - Copyright © 2010–2012 David Roden
+ * Sone - SubstringFilter.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,13 +48,7 @@ public class SubstringFilter implements Filter {
                }
                String dataString = String.valueOf(data);
                int dataLength = dataString.length();
-               if (lengthString == null) {
-                       if (start < 0) {
-                               return dataString.substring(dataLength + start);
-                       }
-                       return dataString.substring(start);
-               }
-               int length = Integer.MAX_VALUE;
+               int length = dataLength;
                try {
                        length = Integer.parseInt(lengthString);
                } catch (NumberFormatException nfe1) {