Author: jaliya
Date: Thu Jun 29 11:24:58 2006
New Revision: 418107
URL: http://svn.apache.org/viewvc?rev=418107&view=rev
Log:
Fixed a NPE and logging
Modified:
webservices/sandesha/branches/sandesha_1_0/interop/org/apache/sandesha/interop/testclient/InteropStub.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/RMMessageContext.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/SandeshaContext.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/ClientHandlerUtil.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/RMSender.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/MessageValidator.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/ThreadPoolInvokeStrategy.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PolicyLoader.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PropertyLoader.java
Modified:
webservices/sandesha/branches/sandesha_1_0/interop/org/apache/sandesha/interop/testclient/InteropStub.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/interop/org/apache/sandesha/interop/testclient/InteropStub.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/interop/org/apache/sandesha/interop/testclient/InteropStub.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/interop/org/apache/sandesha/interop/testclient/InteropStub.java
Thu Jun 29 11:24:58 2006
@@ -142,7 +142,7 @@
} catch (Exception e) {
if (callback != null)
callback.onError(e);
- log.error(e);
+ log.error("",e);
}
}
@@ -210,7 +210,7 @@
} catch (Exception e) {
if (callback != null)
callback.onError(e);
- log.error(e);
+ log.error("",e);
}
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/RMMessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/RMMessageContext.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/RMMessageContext.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/RMMessageContext.java
Thu Jun 29 11:24:58 2006
@@ -386,7 +386,7 @@
msgContext2.setMaintainSession(msgContext1.getMaintainSession());
} catch (AxisFault e) {
- RMMessageContext.log.error(e);
+ RMMessageContext.log.error("Error while compying msgcontex",e);
}
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/SandeshaContext.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/SandeshaContext.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/SandeshaContext.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/SandeshaContext.java
Thu Jun 29 11:24:58 2006
@@ -248,7 +248,7 @@
try {
strategy =
InvokerFactory.getInstance().createInvokerStrategy();
} catch (Exception e) {
- log.error(e);
+ log.error("Could not start the Invoker",e);
throw new AxisFault("Could not start the Invoker.");
}
strategy.start();
@@ -347,7 +347,7 @@
this.report.setError("Inactivity Time Out Reached.
Sequence not complete");
}
} catch (InterruptedException e) {
- log.error(e);
+ log.error("",e);
}
}
}
@@ -398,7 +398,7 @@
try {
addr = InetAddress.getLocalHost();
} catch (UnknownHostException e) {
- log.error(e);
+ log.error("",e);
}
String sourceURL = null;
@@ -429,7 +429,7 @@
clientListner = new ClientListener(listnerPort);
clientListner.start();
} catch (IOException e) {
- log.error(e);
+ log.error("",e);
}
}
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/ClientHandlerUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/ClientHandlerUtil.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/ClientHandlerUtil.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/ClientHandlerUtil.java
Thu Jun 29 11:24:58 2006
@@ -96,7 +96,7 @@
} catch (Exception e) {
- log.error(e);
+ log.error("",e);
return null;
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/RMSender.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/RMSender.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/RMSender.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/client/RMSender.java
Thu Jun 29 11:24:58 2006
@@ -120,7 +120,7 @@
}
} catch (Exception ex) {
- log.error(ex);
+ log.error("",ex);
throw new AxisFault(ex.getMessage());
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/MessageValidator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/MessageValidator.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/MessageValidator.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/MessageValidator.java
Thu Jun 29 11:24:58 2006
@@ -65,11 +65,11 @@
validateForFaults(rmMsgContext);
} catch (SOAPException e) {
- log.error(e);
+ log.error("",e);
throw new AxisFault(new
QName(Constants.FaultCodes.IN_CORRECT_MESSAGE), e.getMessage(),
null, null);
} catch (Exception e) {
- log.error(e);
+ log.error("",e);
throw new AxisFault(new
QName(Constants.FaultCodes.IN_CORRECT_MESSAGE), e.getMessage(),
null, null);
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java
Thu Jun 29 11:24:58 2006
@@ -49,9 +49,13 @@
return new CreateSequenceResponseProcessor(storageManager);
} else if
(addrHeaders.getAction().toString().equals(Constants.WSRM.ACTION_TERMINATE_SEQUENCE))
{
return new TerminateSequenceProcessor(storageManager);
- } else if (rmHeaders.getSequenceAcknowledgement() != null ||
- rmHeaders.getSequence().getMessageNumber() != null) {
- return new CompositeProcessor(storageManager);
+ } else if (rmHeaders != null) {
+ if (rmHeaders.getSequenceAcknowledgement() != null ||
+ rmHeaders.getSequence().getMessageNumber() != null) {
+ return new CompositeProcessor(storageManager);
+ } else {
+ return new FaultProcessor(storageManager);
+ }
} else
return new FaultProcessor(storageManager);
} else if (rmHeaders != null) {
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
Thu Jun 29 11:24:58 2006
@@ -149,13 +149,13 @@
} catch (AxisFault e) {
rmMessageContext.setLocked(false);
- log.error(e);
+ log.error("",e);
} catch (SOAPException e) {
rmMessageContext.setLocked(false);
- log.error(e);
+ log.error("",e);
} catch (Exception e) {
rmMessageContext.setLocked(false);
- log.error(e);
+ log.error("",e);
}
}
rmMessageContext.setLocked(false);
@@ -168,7 +168,7 @@
try {
Thread.sleep(Constants.SENDER_SLEEP_TIME - timeGap);
} catch (Exception ex) {
- log.error(ex);
+ log.error("",ex);
}
}
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/ThreadPoolInvokeStrategy.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/ThreadPoolInvokeStrategy.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/ThreadPoolInvokeStrategy.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/ThreadPoolInvokeStrategy.java
Thu Jun 29 11:24:58 2006
@@ -106,9 +106,9 @@
Thread.sleep(Constants.RMINVOKER_SLEEP_TIME);
getRMInvokerWorker().executeInvoke();
} catch (InterruptedException ex) {
- log.error(ex);
+ log.error("",ex);
} catch (Exception e) {
- log.error(e);
+ log.error("",e);
}
}
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
Thu Jun 29 11:24:58 2006
@@ -132,7 +132,7 @@
rmMsgContext.setOutGoingAddress(to);
rmMsgContext.setMessageType(Constants.MSG_TYPE_ACKNOWLEDGEMENT);
} catch (Exception e) {
- log.error(e);
+ log.error("",e);
}
return rmMsgContext;
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
Thu Jun 29 11:24:58 2006
@@ -90,7 +90,7 @@
rmMsgContext.setMsgContext(msgContext);
rmMsgContext.setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
} catch (Exception e) {
- log.error(e);
+ log.error("Server internal error",e);
throw new AxisFault(new
QName(Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR),
Constants.FaultMessages.SERVER_INTERNAL_ERROR,
null, null);
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
Thu Jun 29 11:24:58 2006
@@ -58,7 +58,7 @@
try {
return sendFault(rmMessageContext);
} catch (Exception e) {
- log.error(e);
+ log.error("Fault in FaultProcessor",e);
return true;
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java
Thu Jun 29 11:24:58 2006
@@ -49,7 +49,7 @@
sq.createNewIncomingSequence(sequenceId);
result = true;
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return result;
}
@@ -60,7 +60,7 @@
SandeshaQueue sq = SandeshaQueue.getInstance(endPoint);
sq.addPriorityMessage(msg);
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return result;
}
@@ -71,7 +71,7 @@
SandeshaQueue sq = SandeshaQueue.getInstance(endPoint);
msg = sq.nextPriorityMessageToSend();
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return msg;
}
@@ -84,7 +84,7 @@
sq.addMessageToIncomingSequence(sequenceId, msgNo,
rmMessageContext);
result = true;
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return result;
}
@@ -102,7 +102,7 @@
try {
msg = sq.nextIncomingMessageToProcess(sequence);
} catch (Exception e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return msg;
}
@@ -138,7 +138,7 @@
sq.addMessageToOutgoingSequence(sequenceId, rmMessageContext);
result = true;
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return result;
}
@@ -150,7 +150,7 @@
sq.createNewOutgoingSequence(sequenceId);
result = true;
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return result;
}
@@ -167,7 +167,7 @@
SandeshaQueue sq = SandeshaQueue.getInstance(endPoint);
msg = sq.nextOutgoingMessageToSend();
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return msg;
}
@@ -228,7 +228,7 @@
try {
sq.addLowPriorityMessage(msg);
} catch (QueueException e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
}
@@ -238,7 +238,7 @@
try {
return sq.getLowPriorityMessageIfAcked();
} catch (Exception e) {
- SandeshaQueueDAO.log.error(e);
+ SandeshaQueueDAO.log.error("",e);
}
return null;
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PolicyLoader.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PolicyLoader.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PolicyLoader.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PolicyLoader.java
Thu Jun 29 11:24:58 2006
@@ -104,7 +104,7 @@
binaryBackOff = geBinaryBackoffInterval(Constants.WSRMPolicy.WSRM,
Constants.WSRMPolicy.BIN_BACKOFF);
} catch (Exception e) {
- log.error(e);
+ log.error("",e);
}
}
@@ -152,7 +152,7 @@
} else
log.error("No WSRMPolicy.xml Found");
} catch (Exception e) {
- log.error(e);
+ log.error("",e);
}
}
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PropertyLoader.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PropertyLoader.java?rev=418107&r1=418106&r2=418107&view=diff
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PropertyLoader.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/PropertyLoader.java
Thu Jun 29 11:24:58 2006
@@ -205,7 +205,7 @@
InputStream in =
Thread.currentThread().getContextClassLoader().getResourceAsStream(Constants.ClientProperties.PROPERTY_FILE);
aProps.load(in);
} catch (IOException e) {
- log.error(e);
+ log.error("",e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
