Author: davidillsley
Date: Fri Feb 1 05:27:16 2008
New Revision: 617496
URL: http://svn.apache.org/viewvc?rev=617496&view=rev
Log:
FINDBUGS: Fix up some FindBugs static analysis issues
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClientConstants.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/Range.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClientConstants.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClientConstants.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClientConstants.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClientConstants.java
Fri Feb 1 05:27:16 2008
@@ -37,5 +37,5 @@
public static final String USE_REPLY_TO_AS_ACKS_TO =
"UseReplyToAsAcksTo";
public static final String OFFERED_ENDPOINT = "OfferedEndpoint";
public static final String AVOID_AUTO_TERMINATION =
"AviodAutoTermination";
- public static String AUTO_START_NEW_SEQUENCE = "AutoStartNewSequence";
+ public static final String AUTO_START_NEW_SEQUENCE =
"AutoStartNewSequence";
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
Fri Feb 1 05:27:16 2008
@@ -114,6 +114,8 @@
}
} catch(Exception e) {
// Do nothing, we failed to find a
Sequence header
+ if (log.isDebugEnabled())
+ log.debug("Exception
encountered accessing Sequence Header " + e.getMessage());
}
if(lastMessageHeader) {
SOAPBody body = env.getBody();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Fri Feb 1 05:27:16 2008
@@ -420,11 +420,17 @@
SandeshaUtil.startWorkersForSequence(msgContext.getConfigurationContext(),
rmsBean);
}
- SOAPEnvelope env = rmMsgCtx.getSOAPEnvelope();
- if (env == null) {
- SOAPEnvelope envelope =
SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(env))
- .getDefaultEnvelope();
- rmMsgCtx.setSOAPEnvelop(envelope);
+
+ int SOAPVersion = Sandesha2Constants.SOAPVersion.v1_1;
+ if (!msgContext.isSOAP11())
+ SOAPVersion =
Sandesha2Constants.SOAPVersion.v1_2;
+ if (msgContext.getEnvelope() == null) {
+ try {
+
msgContext.setEnvelope(SOAPAbstractFactory.getSOAPFactory(
+
SOAPVersion).getDefaultEnvelope());
+ } catch (AxisFault e) {
+ throw new
SandeshaException(e.getMessage());
+ }
}
SOAPBody soapBody =
rmMsgCtx.getSOAPEnvelope().getBody();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Fri Feb 1 05:27:16 2008
@@ -185,7 +185,8 @@
if (endpoint!=null) {
//Check to see if the offer
endpoint has a value of WSA Anonymous
String addressingNamespace =
(String) createSeqRMMsg.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
-
if(endpoint.equals(SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace))){
+ String endpointAddress =
endpoint.getEPR().getAddress();
+
if(SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace).equals(endpointAddress)){
//Don't accept the offer
if
(log.isDebugEnabled())
log.debug("Offer Refused as it included a WSA Anonymous endpoint");
@@ -193,7 +194,7 @@
} else {
rMSBean = new RMSBean();
//Set the offered EP
-
rMSBean.setOfferedEndPoint(endpoint.getEPR().getAddress());
+
rMSBean.setOfferedEndPoint(endpointAddress);
}
} else {
//Don't accept the offer
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java
Fri Feb 1 05:27:16 2008
@@ -133,42 +133,36 @@
propertyBean.setEPRDecoratorClass(element.getText().trim());
} else if (Sandesha2Constants.Assertions.ELEM_STORAGE_MGR
.equals(name)) {
- if (element!=null) {
- //finding out storage managers.
-
- OMElement inmemoryStorageManagerElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_INMEMORY_STORAGE_MGR);
- if (inmemoryStorageManagerElem!=null) {
- String inMemoryStorageMgr =
inmemoryStorageManagerElem.getText().trim();
-
propertyBean.setInMemoryStorageManagerClass(inMemoryStorageMgr);
- }
-
- OMElement permanentStorageManagerElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_PERMANENT_STORAGE_MGR);
- if (permanentStorageManagerElem!=null) {
- String permanentStorageMgr =
permanentStorageManagerElem.getText().trim();
-
propertyBean.setPermanentStorageManagerClass(permanentStorageMgr);
- }
-
- }
-
+ //finding out storage managers.
+
+ OMElement inmemoryStorageManagerElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_INMEMORY_STORAGE_MGR);
+ if (inmemoryStorageManagerElem!=null) {
+ String inMemoryStorageMgr =
inmemoryStorageManagerElem.getText().trim();
+
propertyBean.setInMemoryStorageManagerClass(inMemoryStorageMgr);
+ }
+
+ OMElement permanentStorageManagerElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_PERMANENT_STORAGE_MGR);
+ if (permanentStorageManagerElem!=null) {
+ String permanentStorageMgr =
permanentStorageManagerElem.getText().trim();
+
propertyBean.setPermanentStorageManagerClass(permanentStorageMgr);
+ }
} else if
(Sandesha2Constants.Assertions.ELEM_CONTEXT_MGR.equals(name)) {
propertyBean.setContextManagerClass (element.getText().trim());
} else
if(Sandesha2Constants.Assertions.ELEM_MAKE_CONNECTION.equals(name)) {
- if (element!=null) {
- // Read the nested assertions
-
- OMElement enabledElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_ENABLED);
- if (enabledElem!=null) {
- String data = enabledElem.getText().trim();
-
propertyBean.setEnableMakeConnection(Boolean.valueOf(data).booleanValue());
- }
-
- OMElement useRMAnonElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_USE_RM_ANON_URI);
- if (useRMAnonElem!=null) {
- String data = useRMAnonElem.getText().trim();
-
propertyBean.setEnableRMAnonURI(Boolean.valueOf(data).booleanValue());
- }
- }
+ // Read the nested assertions
+
+ OMElement enabledElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_ENABLED);
+ if (enabledElem!=null) {
+ String data = enabledElem.getText().trim();
+
propertyBean.setEnableMakeConnection(Boolean.valueOf(data).booleanValue());
+ }
+
+ OMElement useRMAnonElem =
element.getFirstChildWithName(Sandesha2Constants.Assertions.Q_ELEM_USE_RM_ANON_URI);
+ if (useRMAnonElem!=null) {
+ String data = useRMAnonElem.getText().trim();
+
propertyBean.setEnableRMAnonURI(Boolean.valueOf(data).booleanValue());
+ }
} else if
(Sandesha2Constants.Assertions.ELEM_USE_SERIALIZATION.equals(name)) {
String value = element.getText().trim();
propertyBean.setUseMessageSerialization(Boolean.valueOf(value).booleanValue());
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
Fri Feb 1 05:27:16 2008
@@ -161,7 +161,9 @@
public void setAcksToEndpointReference(EndpointReference
acksToEndpointRef){
this.acksToEndpointRef = acksToEndpointRef;
- acksToEPR = acksToEndpointRef.getAddress();
+ if(acksToEndpointRef != null){
+ acksToEPR = acksToEndpointRef.getAddress();
+ }
}
/**
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
Fri Feb 1 05:27:16 2008
@@ -267,7 +267,10 @@
MessageContext terminateMessage =
SandeshaUtil.createNewRelatedMessageContext(referenceRMMessage,
terminateOperation);
-
+
+ if (terminateMessage == null)
+ throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
+
if (terminateMessage.getMessageID()==null) {
terminateMessage.setMessageID(SandeshaUtil.getUUID());
}
@@ -279,9 +282,6 @@
String rmNamespaceValue =
SpecSpecificConstants.getRMNamespaceValue(rmsBean.getRMVersion());
RMMsgContext terminateRMMessage =
MsgInitializer.initializeMessage(terminateMessage);
-
- if (terminateMessage == null)
- throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
TerminateSequence terminateSequencePart = new
TerminateSequence(rmNamespaceValue);
Identifier identifier = new Identifier(rmNamespaceValue);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/Range.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/Range.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/Range.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/Range.java
Fri Feb 1 05:27:16 2008
@@ -95,18 +95,6 @@
upperValue = Long.parseLong(parts[1]);
}
- public boolean equals(Object o){
- boolean returnValue = false;
- if(o instanceof Range){
- Range testRange = (Range)o;
- if(testRange.lowerValue== this.lowerValue &&
testRange.upperValue == this.upperValue){
- returnValue = true;
- }
- }
- return returnValue;
- }
-
-
/**
* Value is considered to be "in range" if it is with the limits set by
the
* upper and lower values.
@@ -121,6 +109,29 @@
public String toString(){
return "[" + lowerValue + "," + upperValue + "]";
+ }
+
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = 1;
+ result = PRIME * result + (int) (lowerValue ^ (lowerValue >>>
32));
+ result = PRIME * result + (int) (upperValue ^ (upperValue >>>
32));
+ return result;
+ }
+
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ final Range other = (Range) obj;
+ if (lowerValue != other.lowerValue)
+ return false;
+ if (upperValue != other.upperValue)
+ return false;
+ return true;
}
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
Fri Feb 1 05:27:16 2008
@@ -206,10 +206,10 @@
if (faultText==null) {
faultText = factory.createSOAPFaultText();
- faultReason.addSOAPText(faultText);
+ faultReason.addSOAPText(faultText);
}
- if (data!=null && data.getReason()!=null)
+ if (data.getReason()!=null)
faultText.setText(data.getReason());
SOAPFaultDetail faultDetail = fault.getDetail();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
Fri Feb 1 05:27:16 2008
@@ -26,6 +26,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.xml.namespace.QName;
@@ -451,8 +452,7 @@
newMessageContext.setServerSide(referenceMessage.isServerSide());
//this had to be set here to avoid a double invocation.
- if (oldOptions!=null)
-
newOptions.setUseSeparateListener(oldOptions.isUseSeparateListener());
+
newOptions.setUseSeparateListener(oldOptions.isUseSeparateListener());
return newMessageContext;
@@ -1135,10 +1135,10 @@
Map referenceParams = epr.getAllReferenceParameters();
if (referenceParams != null) {
- for (Iterator keys =
referenceParams.keySet().iterator(); keys
+ for (Iterator entries =
referenceParams.entrySet().iterator(); entries
.hasNext();) {
- Object key = keys.next();
- Object referenceParam =
referenceParams.get(key);
+ Entry entry = (Entry)entries.next();
+ Object referenceParam = entry.getValue();
if (referenceParam instanceof OMElement) {
OMElement clonedElement = ((OMElement)
referenceParam)
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java?rev=617496&r1=617495&r2=617496&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
Fri Feb 1 05:27:16 2008
@@ -61,7 +61,7 @@
private static String CLEANED_AFTER_INVOCATION =
"CleanedAfterInvocation";
- public static HashMap receivingSideCleanMap = new HashMap();
+ private static HashMap receivingSideCleanMap = new HashMap();
public static void checkAndTerminate(ConfigurationContext
configurationContext, StorageManager storageManager, RMSBean rmsBean)
throws SandeshaStorageException, AxisFault {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
