You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/11/24 09:16:18 UTC
svn commit: r478800 - in
/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2:
util/SandeshaUtil.java workers/InvokerWorker.java workers/SenderWorker.java
Author: chamikara
Date: Fri Nov 24 00:16:17 2006
New Revision: 478800
URL: http://svn.apache.org/viewvc?view=rev&rev=478800
Log:
A correction to do the SandeshaUtil.executeAndStore() as a blocking invocation
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=478800&r1=478799&r2=478800
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SandeshaUtil.java Fri Nov 24 00:16:17 2006
@@ -1112,9 +1112,18 @@
if (msgContext.isPaused())
engine.resumeSend(msgContext);
- else
+ else {
+
+ //this invocation has to be a blocking one.
+
+ Boolean isTransportNonBlocking = (Boolean) msgContext.getProperty(MessageContext.TRANSPORT_NON_BLOCKING);
+ if (isTransportNonBlocking!=null && isTransportNonBlocking.booleanValue()==true)
+ msgContext.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, new Boolean (false));
+
engine.send(msgContext);
-
+
+ msgContext.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, isTransportNonBlocking);
+ }
}
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java?view=diff&rev=478800&r1=478799&r2=478800
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java Fri Nov 24 00:16:17 2006
@@ -100,8 +100,8 @@
invoked = true;
} catch (Exception e) {
- if (log.isDebugEnabled())
- log.debug("Exception :", e);
+ if (log.isErrorEnabled())
+ log.error ("Exception :", e);
handleFault(msgToInvoke, e);
@@ -157,11 +157,11 @@
} catch (SandeshaStorageException e) {
transaction.rollback();
} catch (SandeshaException e) {
- e.printStackTrace(); //TODO remove
- log.error(e);
+ if (log.isErrorEnabled())
+ log.error(e);
} catch (Exception e) {
- e.printStackTrace();
- log.error(e);
+ if (log.isErrorEnabled())
+ log.error(e);
} finally {
if (transaction!=null && transaction.isActive())
transaction.commit();
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=478800&r1=478799&r2=478800
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java Fri Nov 24 00:16:17 2006
@@ -171,7 +171,9 @@
} catch (Exception e) {
String message = SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.sendMsgError, e.toString());
- log.error(message, e);
+
+ if (log.isErrorEnabled())
+ log.error(message, e);
} finally {
transaction = storageManager.getTransaction();
msgCtx.setProperty(Sandesha2Constants.WITHIN_TRANSACTION,
@@ -225,13 +227,16 @@
msgCtx.setProperty(Sandesha2Constants.WITHIN_TRANSACTION, Sandesha2Constants.VALUE_FALSE);
} catch (SandeshaStorageException e) {
String message = "Sender got an Storage exception. Transaction will be rollbacked";
- log.error(message,e);
+ if (log.isErrorEnabled())
+ log.error(message,e);
if (transaction!=null && transaction.isActive())
transaction.rollback();
} catch (Exception e) {
String message = "Sender got an exception";
- log.error(message,e);
+
+ if (log.isErrorEnabled())
+ log.error(message,e);
} finally {
if (transaction!=null && transaction.isActive())
transaction.commit();
@@ -338,7 +343,10 @@
} catch (Exception e) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noValidSyncResponse);
- log.debug(message, e);
+
+ if (log.isDebugEnabled())
+ log.debug(message, e);
+
throw new SandeshaException(message, e);
}
if (log.isDebugEnabled())
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org