perfsonar development work

Author: mac
Date: 2009-02-27 09:03:14 -0500 (Fri, 27 Feb 2009)
New Revision: 5004

Modified:
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
Log:
Bug fixed - thrown exception wasn't visible in response.

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-02-27 12:17:35 UTC (rev 5003)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-02-27 14:03:14 UTC (rev 5004)
@@ -116,6 +116,9 @@
 
         for (Message inputMessage: extractMultipleRequests(reqMessage)) {
 
+            ServiceMessage reqSM = new ServiceMessage(inputMessage);
+            ServiceMessage resSM = new ServiceMessage();                
+
             try {
 
                 logger.debug("Request.execute: run Service Engine for 
extracted request");
@@ -123,45 +126,26 @@
                 //run service engine and add result to output list
                 try {
 
-                    ServiceMessage reqSM = new ServiceMessage(inputMessage);
-                    ServiceMessage resSM = new ServiceMessage();
-
                     serviceEngine.takeAction(reqSM, resSM);
 
-
-                    /*
-                    // just for testing
-                    // only first data trigger is used
-
-                    if (resSM.getElement() != null)
-                        response.setElement(resSM.getElement());
-                    else
-                        response.setText(resSM.getText());
-
-                    break;
-                    */
-
-
-                    output.add(new MessagePair(reqSM, resSM));
-
                 } catch (RuntimeException rex) {
                     //just in case of unexpected runtime exception such as
                     //null, indexoutofbounds, classcast, etc.
                     throw new PerfSONARException(
-                            "runtime_exception",
-                            "Runtime exception in ServiceEngine: "
-                            +rex.getMessage());
+                            "runtime_exception", "Runtime exception in 
ServiceEngine: "+rex.getMessage());
                 }
             } catch (PerfSONARException e) {
 
                 //if an exception was thrown, convert it to result code
                 //and add as a new message (to be joined) to array
                 logger.error("Message handler result code: "+e);
-                response.setElement(
-                    ResultCodesUtil.generateResultMessage(null, e));
+                resSM.setElement(ResultCodesUtil.generateResultMessage(null, 
e));
 
             }
 
+            //add response from ServiceEngine or Result code generated above
+            output.add(new MessagePair(reqSM, resSM));
+
         }
 
         MessagePair messagePair = mergeMultipleResponses(output);