perfsonar development work

Author: mac
Date: 2008-07-17 04:19:31 -0400 (Thu, 17 Jul 2008)
New Revision: 4217

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
Log:
"No message id" bug fixed
Message type added

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
       2008-07-16 14:55:03 UTC (rev 4216)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandler.java
       2008-07-17 08:19:31 UTC (rev 4217)
@@ -45,7 +45,8 @@
        private volatile Object initialisationMutex = new Object();
 
     private String messageId = null;
-    private long t0 = 0;    
+    private long t0 = 0;
+    private String messageType = null;    
     
     /**
      *  Accepts web service based calls and gives back responses
@@ -103,6 +104,8 @@
                                
                Message requestMessage = convertMessage(request);
                checkMessage(requestMessage);
+        messageType  = requestMessage.getType();
+        messageId = requestMessage.getId();
                
                logger.debug("RequestHandler: Message object constructed from 
request. Request is of type: " + requestMessage.getType());
                /* Check if it isn't just an InitService message */
@@ -273,8 +276,8 @@
     private void logExecutionTime() {
 
         long t1 = System.currentTimeMillis();
-        logger.info("Execution Time of message ["
-                + ((messageId == null) ? "" : messageId) + "] is ["
+        logger.info("Execution Time of message type=["+messageType+
+                "] id=["+ messageId + "] is ["
                 + (t1 - t0) + "] milliseconds");
     }