svn commit: r900684 - in /incubator/aries/trunk/jpa/jpa-container-context/src: main/java/org/apache/aries/jpa/container/context/namespace/NSHandler.java test/java/org/apache/aries/jpa/container/context/namespace/NSHandlerTest.java test/resources/jpa.xml

[ma...@apache.org]

Author: mahrwald
Date: Tue Jan 19 07:19:38 2010
New Revision: 900684

URL: http://svn.apache.org/viewvc?rev=900684&view=rev
Log:
ARIES-118 Handle empty unit name in NSHandler

Modified:
    incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/namespace/NSHandler.java
    incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/namespace/NSHandlerTest.java
    incubator/aries/trunk/jpa/jpa-container-context/src/test/resources/jpa.xml

Modified: incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/namespace/NSHandler.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/namespace/NSHandler.java?rev=900684&r1=900683&r2=900684&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/namespace/NSHandler.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/namespace/NSHandler.java Tue Jan 19 07:19:38 2010
@@ -210,8 +210,13 @@
   }
   
   private String parseUnitName(Element element) {
-    return element.hasAttribute(ATTR_UNIT_NAME) ?
+    String result = element.hasAttribute(ATTR_UNIT_NAME) ? 
         element.getAttribute(ATTR_UNIT_NAME) : DEFAULT_UNIT_NAME;
+    
+    if ("".equals(result))
+      result = DEFAULT_UNIT_NAME;
+    
+    return result;
   }
   
   private Map<String, Object> parseJPAProperties(Element element, ParserContext context) {

Modified: incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/namespace/NSHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/namespace/NSHandlerTest.java?rev=900684&r1=900683&r2=900684&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/namespace/NSHandlerTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/namespace/NSHandlerTest.java Tue Jan 19 07:19:38 2010
@@ -118,6 +118,18 @@
     assertEquals("(!(osgi.unit.name=*))", reference.getFilter());
   }
   
+  @Test
+  public void testEmptyUnitName() {
+    Element e = getTestElement("emptyUnitName");
+    BeanMetadata bean = 
+      (BeanMetadata) sut.decorate(e, Skeleton.newMock(BeanMetadata.class), null);
+    BeanProperty property = (BeanProperty) bean.getProperties().get(0);
+    ReferenceMetadata reference = (ReferenceMetadata) property.getValue();
+    
+    assertEquals("emf3", property.getName());
+    assertEquals("(!(osgi.unit.name=*))", reference.getFilter());
+  }
+  
   @Test 
   public void testBeanMetadataOverwrite() {
     Element e = getTestElement("unit");

Modified: incubator/aries/trunk/jpa/jpa-container-context/src/test/resources/jpa.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-context/src/test/resources/jpa.xml?rev=900684&r1=900683&r2=900684&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-context/src/test/resources/jpa.xml (original)
+++ incubator/aries/trunk/jpa/jpa-container-context/src/test/resources/jpa.xml Tue Jan 19 07:19:38 2010
@@ -26,6 +26,10 @@
     <jpa:unit property="emf2" />
   </bean>
   
+  <bean id="emptyUnitName">
+    <jpa:unit property="emf3" unitname="" />
+  </bean>
+  
   <bean id="context">
     <jpa:context property="em" unitname="myUnit"/>
   </bean>