You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dl...@apache.org on 2017/02/20 06:27:28 UTC

svn commit: r1783715 - in /felix/trunk/converter/schematizer: pom.xml src/main/java/org/apache/felix/serializer/impl/json/JsonParser.java

Author: dleangen
Date: Mon Feb 20 06:27:28 2017
New Revision: 1783715

URL: http://svn.apache.org/viewvc?rev=1783715&view=rev
Log:
FELIX-5414: Applying the same fix to the Schematizer

Modified:
    felix/trunk/converter/schematizer/pom.xml
    felix/trunk/converter/schematizer/src/main/java/org/apache/felix/serializer/impl/json/JsonParser.java

Modified: felix/trunk/converter/schematizer/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/converter/schematizer/pom.xml?rev=1783715&r1=1783714&r2=1783715&view=diff
==============================================================================
--- felix/trunk/converter/schematizer/pom.xml (original)
+++ felix/trunk/converter/schematizer/pom.xml Mon Feb 20 06:27:28 2017
@@ -66,9 +66,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-Activator>org.apache.felix.schematizer.impl.Activator</Bundle-Activator>
-                        <Private-Package>org.apache.felix.schematizer.*, org.apache.felix.serializer.*,org.yaml.snakeyaml.*</Private-Package>
-                        <Export-Package>org.apache.felix.schematizer</Export-Package>
-                        <Import-Package>org.apache.felix.converter, org.apache.felix.serializer, *</Import-Package>
+                        <Private-Package>org.apache.felix.schematizer.*, org.apache.felix.serializer.impl.*,org.yaml.snakeyaml.*</Private-Package>
+                        <Export-Package>org.apache.felix.schematizer; uses:="org.osgi.util.converter,org.osgi.util.function,org.osgi.service.serializer,org.osgi.dto,org.osgi.framework"</Export-Package>
                         <Import-Package>org.osgi.util.converter, org.osgi.service.serializer, *</Import-Package>
                     </instructions>
                 </configuration>

Modified: felix/trunk/converter/schematizer/src/main/java/org/apache/felix/serializer/impl/json/JsonParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/schematizer/src/main/java/org/apache/felix/serializer/impl/json/JsonParser.java?rev=1783715&r1=1783714&r2=1783715&view=diff
==============================================================================
--- felix/trunk/converter/schematizer/src/main/java/org/apache/felix/serializer/impl/json/JsonParser.java (original)
+++ felix/trunk/converter/schematizer/src/main/java/org/apache/felix/serializer/impl/json/JsonParser.java Mon Feb 20 06:27:28 2017
@@ -76,7 +76,7 @@ public class JsonParser {
 
     public JsonParser(CharSequence json) {
         String str = json.toString();
-        str = str.trim().replace('\n', ' ');
+        str = str.trim().replace('\n', ' ').replace('\r', ' ');
         parsed = parseObject(str);
     }