perfsonar development work

Author: trzaszcz
Date: 2009-09-29 09:40:19 -0400 (Tue, 29 Sep 2009)
New Revision: 5289

Removed:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/dao/
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/test/
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSKeepaliveServiceEngine.java
Log:


Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSKeepaliveServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSKeepaliveServiceEngine.java
 2009-09-28 12:04:31 UTC (rev 5288)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSKeepaliveServiceEngine.java
 2009-09-29 13:40:19 UTC (rev 5289)
@@ -11,6 +11,7 @@
  * KEEPALIVE - register/keepalive Action
  * 
  * @author Maciej Glowiak
+ *         Trzaszcz
  * 
  */
 public class LSKeepaliveServiceEngine extends LSGenericRegisterServiceEngine 
{
@@ -38,7 +39,9 @@
             ServiceMessage serviceResponse) throws PerfSONARException {
 
         logger.debug("[LSKeepaliveAction] Action KEEPALIVE started");
-
+        
+        Message msg;
+        
         // extract message
         Message requestMessage = serviceRequest.getMessageElement();
 
@@ -53,18 +56,18 @@
             // key is registered, update time
             logger.debug("LSKeepaliveAction: LookupInfo found, KEEPALIVE - 
update time");
             updateTime(keyValue);
-
+            msg = ResultCodesUtil.generateResultMessage(null,
+                    "success/ls/keepalive", "Timestamp for [" + keyValue
+                            + "] has been updated");
         } else {
-            String m = "LSKeepaliveAction: Key [" + keyValue
+               String m = "LSKeepaliveAction: Key [" + keyValue
                     + "] not found, can't be updated";
-            logger.error(m);
-            throw new PerfSONARException("error/ls/key_not_found", m);
+            msg= ResultCodesUtil.generateResultMessage(null,
+                    "error/ls/key_not_found", m);
+            
+            logger.warn(m);
         }
 
-        Message msg = ResultCodesUtil.generateResultMessage(null,
-                "success/ls/keepalive", "Timestamp for [" + keyValue
-                        + "] has been updated");
-
         serviceResponse.setElement(msg);
 
     }