perfsonar development work

Author: psnc.pietrzak
Date: 2010-08-12 10:59:32 +0100 (Thu, 12 Aug 2010)
New Revision: 5720

Modified:
   trunk/perfsonar-java-base2/pom.xml
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
Log:
Bug fix for LS registration

Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml  2010-08-10 09:43:00 UTC (rev 5719)
+++ trunk/perfsonar-java-base2/pom.xml  2010-08-12 09:59:32 UTC (rev 5720)
@@ -8,7 +8,7 @@
        <artifactId>ps-mdm-base2</artifactId>
        <packaging>jar</packaging>
        <name>Perfsonar Base2 package</name>
-       <version>1.0.3</version>
+       <version>1.0.4</version>
        <description>
         The perfSONAR base provides a number of common, shared classes which 
can be used by
         MA, MP and Clients.

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
    2010-08-10 09:43:00 UTC (rev 5719)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
    2010-08-12 09:59:32 UTC (rev 5720)
@@ -278,7 +278,8 @@
                      *   mapping.add(oldId, newId);
                      *
                      */
-                    if (meta1.getSubject().getMetadataIdRef() != null) {
+                    if ((meta1.getSubject() != null)
+                               && (meta1.getSubject().getMetadataIdRef() != 
null)) {
                        if (ids.get(meta1.getSubject().getMetadataIdRef()) != 
null)
                            
meta1.getSubject().setMetadataIdRef(ids.get(meta1.getSubject().getMetadataIdRef()));
                     }