You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2014/03/25 20:29:03 UTC

svn commit: r1581477 - /felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java

Author: rickhall
Date: Tue Mar 25 19:29:03 2014
New Revision: 1581477

URL: http://svn.apache.org/r1581477
Log:
String.split() behaves differently in Java8 so apply patch to
handle this better. (FELIX-4425)

Modified:
    felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java

Modified: felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java?rev=1581477&r1=1581476&r2=1581477&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java (original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java Tue Mar 25 19:29:03 2014
@@ -470,16 +470,15 @@ public class Options implements Option {
                     }
                 }
                 else {
-                    int i = 0;
-                    for (String c : arg.substring(1).split("")) {
-                        if (i++ == 0)
-                            continue;
+                    for (int i = 1; i < arg.length(); i++) {
+                        String c = String.valueOf(arg.charAt(i));
                         if (optName.containsKey(c)) {
                             String name = optName.get(c);
                             optSet.put(name, true);
                             if (optArg.containsKey(name)) {
-                                if (i < arg.length()) {
-                                    addArg(name, arg.substring(i));
+                                int k = i + 1;
+                                if (k < arg.length()) {
+                                    addArg(name, arg.substring(k));
                                 }
                                 else {
                                     needOpt = c;