[MSC-76] Problem in DFA parser causes quoted last segment to be doubl…

…ed in final service name
jboss-msc · Apr 29, 2011 · 2eeb9c9 · 2eeb9c9
1 parent 156289a
commit 2eeb9c9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/jboss/msc/service/ServiceName.java b/src/main/java/org/jboss/msc/service/ServiceName.java
@@ -456,9 +456,11 @@ public static ServiceName parse(String original) throws IllegalArgumentException
                 // End of string unexpected.
                 throw unexpectedEnd();
             }
-            case 1:
-            case 9: {
+            case 1: {
                 segments.add(builder.toString());
+                // fall thru
+            }
+            case 9: {
                 break;
             }
             default: throw new IllegalStateException();

diff --git a/src/test/java/org/jboss/msc/service/ServiceNameTestCase.java b/src/test/java/org/jboss/msc/service/ServiceNameTestCase.java
@@ -293,4 +293,12 @@ public void testSerialize() throws Exception {
         ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes));
         assertEquals(serviceName, objectInputStream.readObject());
     }
+
+    @Test
+    public void testMsc76Parsing() {
+        assertEquals(ServiceName.parse("jboss.server.path.\"java.home\""), ServiceName.of("jboss", "server", "path", "java.home"));
+        assertEquals(ServiceName.parse("jboss.server.path.\"jboss.home.dir\""), ServiceName.of("jboss", "server", "path", "jboss.home.dir"));
+        assertEquals(ServiceName.parse("\"first.section\".\"second.section\".third.fourth"), ServiceName.of("first.section", "second.section", "third", "fourth"));
+        assertEquals(ServiceName.parse("\"all.in.one\""), ServiceName.of("all.in.one"));
+    }
 }