svn commit: r1525583 - in /sling/branches/tooling-ide-vlt/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/ impl-vlt/src/org/apache/sling/...

[rombert]

Author: rombert
Date: Mon Sep 23 13:15:32 2013
New Revision: 1525583

URL: http://svn.apache.org/r1525583
Log:
SLING-3095 -  StringIndexOutOfBoundsException within
ContentXmlHandler.java:210

Applied patch from Konrad Windszus.

Modified:
    
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
    
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
    
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java?rev=1525583&r1=1525582&r2=1525583&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
 Mon Sep 23 13:15:32 2013
@@ -47,7 +47,7 @@ public class ContentXmlHandlerTest {
 
         Map<String, Object> properties = 
parseContentXmlFile("simple-content.xml", "/").getProperties();
 
-        assertThat("properties.size", properties.size(), is(11));
+        assertThat("properties.size", properties.size(), is(12));
 
         assertThat("properties[jcr:primaryType]", properties, 
hasEntry("jcr:primaryType", (Object) "sling:Folder"));
         assertThat("properties[jcr:title]", properties, hasEntry("jcr:title", 
(Object) "Application folder"));
@@ -60,6 +60,7 @@ public class ContentXmlHandlerTest {
                 hasEntry("lastIndexId", (Object) 
Long.valueOf(7293120000000l)));
         assertThat("properties[lastIndexId]", properties,
                 hasEntry("lastIndexId", (Object) 
Long.valueOf(7293120000000l)));
+        assertThat("properties[emptyValue]", properties, 
hasEntry("emptyValue", (Object) ""));
 
     }
 

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml?rev=1525583&r1=1525582&r2=1525583&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
 Mon Sep 23 13:15:32 2013
@@ -3,6 +3,7 @@
     jcr:primaryType="sling:Folder"
     jcr:title="Application folder"
     indexDuration="{Decimal}500"
+    emptyValue=""
     indexed="{Boolean}true"
     indexRatio="{Double}2.54"
     lastIndexId="{Long}7293120000000"

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java?rev=1525583&r1=1525582&r2=1525583&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
 Mon Sep 23 13:15:32 2013
@@ -206,6 +206,10 @@ public class ContentXmlHandler extends D
 
             String rawValue;
             int hintEnd = -1;
+            
+            if (value.isEmpty()) {
+               return value;
+            }
 
             if (value.charAt(0) != '{') {
                 rawValue = value;