svn commit: r1717206 - in /felix/trunk/webconsole-plugins/script-console/src: main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ test/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/

[chetanm]

Author: chetanm
Date: Mon Nov 30 09:01:44 2015
New Revision: 1717206

URL: http://svn.apache.org/viewvc?rev=1717206&view=rev
Log:
FELIX-5120 - ScriptEngineManager not able to parse service file with comments 
at end of classname

Handle the case where service class line has a comment at the end

Modified:
    
felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManager.java
    
felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManagerTest.java

Modified: 
felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManager.java?rev=1717206&r1=1717205&r2=1717206&view=diff
==============================================================================
--- 
felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManager.java
 (original)
+++ 
felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManager.java
 Mon Nov 30 09:01:44 2015
@@ -261,6 +261,12 @@ class ScriptEngineManager implements Bun
         {
             if (!line.startsWith("#") && line.trim().length() > 0)
             {
+                int indexOfHash = line.indexOf('#');
+                if (indexOfHash >= 0)
+                {
+                    line = line.substring(0, indexOfHash);
+                }
+                line = line.trim();
                 classNames.add(line);
             }
         }

Modified: 
felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManagerTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManagerTest.java?rev=1717206&r1=1717205&r2=1717206&view=diff
==============================================================================
--- 
felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManagerTest.java
 (original)
+++ 
felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptEngineManagerTest.java
 Mon Nov 30 09:01:44 2015
@@ -23,7 +23,6 @@ import java.io.BufferedReader;
 import java.io.StringReader;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static java.util.Arrays.asList;
@@ -49,7 +48,6 @@ public class ScriptEngineManagerTest {
         
assertEquals(asList("org.codehaus.groovy.jsr223.GroovyScriptEngineFactory"),classNames);
     }
 
-    @Ignore("FELIX-5120")
     @Test
     public void configWithCommentAtEnd() throws Exception
     {
@@ -60,6 +58,5 @@ public class ScriptEngineManagerTest {
                 "\n";
         List<String> classNames = ScriptEngineManager.getClassNames(new 
BufferedReader(new StringReader(config)));
         
assertEquals(asList("com.sun.script.javascript.RhinoScriptEngineFactory"),classNames);
-
     }
 }