svn commit: r1505197 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java

[hiranya]

Author: hiranya
Date: Sat Jul 20 20:17:45 2013
New Revision: 1505197

URL: http://svn.apache.org/r1505197
Log:
Applying patch for SYNAPSE-941. Fail safe mode for message stores and 
processors.

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=1505197&r1=1505196&r2=1505197&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
 Sat Jul 20 20:17:45 2013
@@ -277,17 +277,29 @@ public class SynapseXMLConfigurationFact
         return executor;
     }
 
-    public static MessageStore defineMessageStore(SynapseConfiguration config ,
+    public static MessageStore defineMessageStore(SynapseConfiguration config,
                                                   OMElement elem, Properties 
properties) {
-        MessageStore messageStore = 
MessageStoreFactory.createMessageStore(elem, properties);
-        config.addMessageStore(messageStore.getName(), messageStore);
+        MessageStore messageStore = null;
+        try {
+            messageStore = MessageStoreFactory.createMessageStore(elem, 
properties);
+            config.addMessageStore(messageStore.getName(), messageStore);
+        } catch (Exception e) {
+            String msg = "Message Store configuration cannot be built";
+            
handleConfigurationError(SynapseConstants.FAIL_SAFE_MODE_MESSAGE_STORES, msg, 
e);
+        }
         return messageStore;
     }
 
     public static MessageProcessor defineMessageProcessor(SynapseConfiguration 
config,
                                                           OMElement elem, 
Properties properties) {
-        MessageProcessor processor  = 
MessageProcessorFactory.createMessageProcessor(elem);
-        config.addMessageProcessor(processor.getName(), processor);
+        MessageProcessor processor = null;
+        try {
+            processor = MessageProcessorFactory.createMessageProcessor(elem);
+            config.addMessageProcessor(processor.getName(), processor);
+        } catch (Exception e) {
+            String msg = "Message Processor configuration cannot be built";
+            
handleConfigurationError(SynapseConstants.FAIL_SAFE_MODE_MESSAGE_PROCESSORS, 
msg, e);
+        }
         return processor;
     }