perfsonar development work

Author: mac
Date: 2006-11-07 10:45:35 -0500 (Tue, 07 Nov 2006)
New Revision: 1743

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
Log:
Bug corrected, always returned "success" even if there were no metadata/data 
removed.
Now it return correct result code for success "success.ls.deregister" or 
"error.ls.key_not_found" if there weren't any data and metadata to be removed.




Modified: 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
     2006-11-07 15:26:50 UTC (rev 1742)
+++ 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
     2006-11-07 15:45:35 UTC (rev 1743)
@@ -143,13 +143,11 @@
         logger.debug("XmlTypeLSServiceEngine: Removed 
data="+countDataRemoved+
                 ", metadata="+countMetadataRemoved);        
         
-        //Prepare result code (put it into the response)
-        Message response = new Message();
+        //Prepare result code
         
-        // XXX: Should there be a different type for response?
-        response.setType("LSDeregisterResponse");
-        
-        throw new SystemException("result.success", "Removed ["+
+        if ((countDataRemoved==0) && (countMetadataRemoved==0))
+            throw new SystemException("error.ls.key_not_found", "There were 
no metadata and data for key ["+keyValue+"]");
+        throw new SystemException("success.ls.deregister", "Removed ["+
                 countMetadataRemoved+"] metadata and ["+
                 countDataRemoved+"] data blocks for key ["+keyValue+"]");