You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/05/07 20:55:08 UTC
svn commit: r942176 - in
/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel:
common/CorrelationKey.java common/CorrelationKeySet.java
evt/VariableModificationEvent.java iapi/Endpoint.java
Author: rr
Date: Fri May 7 18:55:07 2010
New Revision: 942176
URL: http://svn.apache.org/viewvc?rev=942176&view=rev
Log:
ODE-796: FindBugs Patches for bpel-api project, thanks to David Carver
Modified:
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/VariableModificationEvent.java
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java?rev=942176&r1=942175&r2=942176&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java Fri May 7 18:55:07 2010
@@ -131,6 +131,10 @@ public class CorrelationKey implements S
* @return <code>true</code> if the given object
*/
public boolean equals(Object o) {
+ if (!(o instanceof CorrelationKey)) {
+ return false;
+ }
+
CorrelationKey okey = (CorrelationKey) o;
if (okey == null || !okey._csetName.equals(_csetName) || okey._keyValues.length != _keyValues.length)
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java?rev=942176&r1=942175&r2=942176&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java Fri May 7 18:55:07 2010
@@ -79,7 +79,7 @@ public class CorrelationKeySet implement
*/
public CorrelationKeySet add(CorrelationKey ck) {
for( CorrelationKey key : correlationKeys ) {
- if( key.getCorrelationSetName() == ck.getCorrelationSetName() ) {
+ if( key.getCorrelationSetName().equals(ck.getCorrelationSetName()) ) {
correlationKeys.remove(ck);
break;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/VariableModificationEvent.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/VariableModificationEvent.java?rev=942176&r1=942175&r2=942176&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/VariableModificationEvent.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/VariableModificationEvent.java Fri May 7 18:55:07 2010
@@ -24,7 +24,7 @@ import org.w3c.dom.Node;
public class VariableModificationEvent extends VariableEvent {
private static final long serialVersionUID = 1L;
- private Node newValue;
+ private transient Node newValue;
public VariableModificationEvent() {
super();
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java?rev=942176&r1=942175&r2=942176&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java Fri May 7 18:55:07 2010
@@ -47,6 +47,9 @@ public class Endpoint {
*/
@Override
public boolean equals(Object other) {
+ if (!(other instanceof Endpoint)) {
+ return false;
+ }
Endpoint o = (Endpoint) other;
return o.serviceName.equals(serviceName) && o.portName.equals(portName);
}