svn commit: r663149 - in /felix/trunk/metatype/src/main/java/org/apache/felix/metatype: Attribute.java MetaDataReader.java

[christian]

Author: christian
Date: Wed Jun  4 08:00:34 2008
New Revision: 663149

URL: http://svn.apache.org/viewvc?rev=663149&view=rev
Log:
Fixed small bug in the meta type service: when reading meta type resources the 
content of an attribute tag was incorrectly split on comma's when it was 
provided in one or more value child tags instead of in the content argument of 
the attribute tag itself.

Modified:
    felix/trunk/metatype/src/main/java/org/apache/felix/metatype/Attribute.java
    
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java

Modified: 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/Attribute.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/Attribute.java?rev=663149&r1=663148&r2=663149&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/Attribute.java 
(original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/Attribute.java 
Wed Jun  4 08:00:34 2008
@@ -23,7 +23,7 @@
  * The <code>Attribute</code> TODO
  *
  * @author fmeschbe
- * @version $Rev:$, $Date:$
+ * @version $Rev$, $Date$
  */
 public class Attribute
 {
@@ -63,16 +63,25 @@
                 String[] newContent = new String[content.length + 
added.length];
                 System.arraycopy( content, 0, newContent, 0, content.length );
                 System.arraycopy( added, 0, newContent, content.length, 
added.length );
+                content = newContent;
             }
         }
     }
 
 
-    public void addContent( String content )
+    public void addContent( String content, boolean split )
     {
         if ( content != null )
         {
-            addContent( AD.splitList( content ) );
+            if ( split )
+            {
+               addContent( AD.splitList( content ) );
+            }
+            else
+            {
+               addContent( new String[] { content } );
+            }
         }
     }
+    
 }

Modified: 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java?rev=663149&r1=663148&r2=663149&view=diff
==============================================================================
--- 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java
 (original)
+++ 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/MetaDataReader.java
 Wed Jun  4 08:00:34 2008
@@ -365,7 +365,7 @@
     {
         Attribute ah = this.createAttribute();
         ah.setAdRef( this.getRequiredAttribute( "adref" ) );
-        ah.addContent( this.getOptionalAttribute( "content" ) );
+        ah.addContent( this.getOptionalAttribute( "content" ), true );
 
         int eventType = this.parser.next();
         while ( eventType != XmlPullParser.END_DOCUMENT )
@@ -374,7 +374,7 @@
             {
                 if ( "Value".equals( this.parser.getName() ) )
                 {
-                    ah.addContent( this.parser.nextText() );
+                    ah.addContent( this.parser.nextText(), false );
                     eventType = this.parser.getEventType();
                     continue;
                 }