[Comsuite-svn] SF.net SVN: comsuite: [137] trunk/code/CSMiddleware/src/org/commsuite

[<mal...@us...>]

Revision: 137
          http://svn.sourceforge.net/comsuite/?rev=137&view=rev
Author:   malinowskirafal
Date:     2006-09-19 11:21:14 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
    trunk/code/CSMiddleware/src/org/commsuite/messaging/JMSMessageManager.java
    trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java

Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java	2006-09-19 12:37:26 UTC (rev 136)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java	2006-09-19 18:21:14 UTC (rev 137)
@@ -113,6 +113,7 @@
 			
 			Throwable t = getConverter().getThrowable();
 			if (t != null) {
+				faxDevice.closeConnection(hylaFAXClient);
 				throw new OutboundMessageConversionFailedException(t);
 			}
 			
@@ -129,6 +130,7 @@
 			hylafaxJob.setKilltime("000159");
 			
 			hylaFAXClient.submit(hylafaxJob);
+			faxDevice.closeConnection(hylaFAXClient);
 		}
 		catch (IOException e) {
 			logger.error("cannot send, IOException", e);

Modified: trunk/code/CSMiddleware/src/org/commsuite/messaging/JMSMessageManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/messaging/JMSMessageManager.java	2006-09-19 12:37:26 UTC (rev 136)
+++ trunk/code/CSMiddleware/src/org/commsuite/messaging/JMSMessageManager.java	2006-09-19 18:21:14 UTC (rev 137)
@@ -56,7 +56,8 @@
         	return;
         }
 
-        final Queue queue = createQueue(queueName);
+//        final Queue queue = createQueue(queueName);
+        final Queue queue = getQueueByName(queueName);
         final JmsTemplate template = getTemplate();
         
         template.send(queue, new MessageCreator() {

Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java	2006-09-19 12:37:26 UTC (rev 136)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java	2006-09-19 18:21:14 UTC (rev 137)
@@ -53,6 +53,10 @@
  * @author Agnieszka Wiśniewska
  */
 public class SAPComm implements ISAPComm {
+	
+	private MessageManager msgManager;
+	
+	private JMSMessageManager jmsManager;
 
     private long SX_OBJECT_RECEIVE_functionsNumber;
 
@@ -203,8 +207,13 @@
                 final Message[] messages = JCoFunctionTranslator.getMessagesFromJCOFunction(
                         function, charset);
 
-                final MessageManager msgManager = SpringMiddlewareContext.getMessageManager();
-                final JMSMessageManager jmsManager = SpringMiddlewareContext.getJMSManager();
+                if (null == msgManager) {
+                	msgManager = SpringMiddlewareContext.getMessageManager();
+                }
+                
+                if (null == jmsManager) {
+                	jmsManager = SpringMiddlewareContext.getJMSManager();
+                }
 
                 final Date currentDate = new Date();
                 for (Message msg : messages) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.