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 19:48:55 UTC
svn commit: r942159 - in /ode/trunk:
bpel-api/src/main/java/org/apache/ode/bpel/iapi/
bpel-dao/src/main/java/org/apache/ode/dao/bpel/
jacob/src/main/java/org/apache/ode/jacob/vpu/
runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/ runtimes/src/main/j...
Author: rr
Date: Fri May 7 17:48:55 2010
New Revision: 942159
URL: http://svn.apache.org/viewvc?rev=942159&view=rev
Log:
FindBugs Patches for ODE Runtime (thanks to David Carver)
Modified:
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/RoleEnum.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeStateEnum.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OutstandingRequestManager.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/PartnerLinkInstance.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/VariableInstance.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ResourceInstance.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java
Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/Endpoint.java Fri May 7 17:48:55 2010
@@ -47,6 +47,9 @@ public class Endpoint {
*/
@Override
public boolean equals(Object other) {
+ if (other == null) {
+ return false;
+ }
Endpoint o = (Endpoint) other;
return o.serviceName.equals(serviceName) && o.portName.equals(portName);
}
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/RoleEnum.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/RoleEnum.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/RoleEnum.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/RoleEnum.java Fri May 7 17:48:55 2010
@@ -47,6 +47,9 @@ public class RoleEnum {
* @see Object#equals(java.lang.Object)
*/
public boolean equals(Object o) {
+ if (o == null) {
+ return false;
+ }
return ((RoleEnum)o)._id == _id;
}
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeStateEnum.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeStateEnum.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeStateEnum.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeStateEnum.java Fri May 7 17:48:55 2010
@@ -43,6 +43,9 @@ public class ScopeStateEnum {
}
public boolean equals(Object o) {
+ if (o == null) {
+ return false;
+ }
return ((ScopeStateEnum)o).myName.equals(myName);
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java Fri May 7 17:48:55 2010
@@ -69,6 +69,9 @@ public class ChannelFactory {
}
public boolean equals(Object other) {
+ if (other == null) {
+ return false;
+ }
return ((ChannelInvocationHandler) other)._backend.equals(_backend);
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java Fri May 7 17:48:55 2010
@@ -806,6 +806,9 @@ public class ExecutionQueueImpl implemen
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
return ((ChannelRef) obj)._id.equals(_id);
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OutstandingRequestManager.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OutstandingRequestManager.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OutstandingRequestManager.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OutstandingRequestManager.java Fri May 7 17:48:55 2010
@@ -233,6 +233,9 @@ class OutstandingRequestManager implemen
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
RequestIdTuple other = (RequestIdTuple) obj;
return other.partnerLink.equals(partnerLink) &&
other.opName.equals(opName) &&
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/PartnerLinkInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/PartnerLinkInstance.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/PartnerLinkInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/PartnerLinkInstance.java Fri May 7 17:48:55 2010
@@ -55,6 +55,9 @@ public class PartnerLinkInstance impleme
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
PartnerLinkInstance other = (PartnerLinkInstance) obj;
return partnerLink.equals(other.partnerLink) && scopeInstanceId.equals(other.scopeInstanceId);
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/VariableInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/VariableInstance.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/VariableInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/VariableInstance.java Fri May 7 17:48:55 2010
@@ -38,6 +38,9 @@ public class VariableInstance implements
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
VariableInstance other = (VariableInstance) obj;
return other.declaration.equals(declaration) && other.scopeInstance.equals(scopeInstance);
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java Fri May 7 17:48:55 2010
@@ -304,6 +304,9 @@ class OutstandingRequestManager implemen
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
RequestIdTuple other = (RequestIdTuple) obj;
return other.partnerLink.equals(partnerLink) &&
other.opName.equals(opName) &&
@@ -343,6 +346,9 @@ class OutstandingRequestManager implemen
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
ReplyIdTuple other = (ReplyIdTuple) obj;
return other.partnerLink.equals(partnerLink) &&
other.opName.equals(opName) &&
@@ -379,6 +385,9 @@ class OutstandingRequestManager implemen
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
RequestResTuple other = (RequestResTuple) obj;
return other.resource.equals(resource) && other.method.equals(method) && other.mexId.equals(mexId);
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java Fri May 7 17:48:55 2010
@@ -54,6 +54,9 @@ public class PartnerLinkInstance impleme
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
PartnerLinkInstance other = (PartnerLinkInstance) obj;
return partnerLink.equals(other.partnerLink) && scopeInstanceId.equals(other.scopeInstanceId);
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ResourceInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ResourceInstance.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ResourceInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ResourceInstance.java Fri May 7 17:48:55 2010
@@ -38,6 +38,9 @@ public class ResourceInstance implements
@Override
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
ResourceInstance other = (ResourceInstance) obj;
return scopeInstanceId.equals(other.getScopeInstanceId()) && resource.equals(other.getModel());
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java Fri May 7 17:48:55 2010
@@ -38,6 +38,9 @@ public class VariableInstance implements
}
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
VariableInstance other = (VariableInstance) obj;
return other.declaration.equals(declaration) && other.scopeInstance.equals(scopeInstance);
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java Fri May 7 17:48:55 2010
@@ -1118,7 +1118,7 @@ public class CronExpression implements S
int min = cl.get(Calendar.MINUTE);
// get second.................................................
- st = seconds.tailSet(new Integer(sec));
+ st = seconds.tailSet(Integer.valueOf(sec));
if (st != null && st.size() != 0) {
sec = ((Integer) st.first()).intValue();
} else {
@@ -1133,7 +1133,7 @@ public class CronExpression implements S
t = -1;
// get minute.................................................
- st = minutes.tailSet(new Integer(min));
+ st = minutes.tailSet(Integer.valueOf(min));
if (st != null && st.size() != 0) {
t = min;
min = ((Integer) st.first()).intValue();
@@ -1154,7 +1154,7 @@ public class CronExpression implements S
t = -1;
// get hour...................................................
- st = hours.tailSet(new Integer(hr));
+ st = hours.tailSet(Integer.valueOf(hr));
if (st != null && st.size() != 0) {
t = hr;
hr = ((Integer) st.first()).intValue();
@@ -1182,7 +1182,7 @@ public class CronExpression implements S
boolean dayOfMSpec = !daysOfMonth.contains(NO_SPEC);
boolean dayOfWSpec = !daysOfWeek.contains(NO_SPEC);
if (dayOfMSpec && !dayOfWSpec) { // get day by day of month rule
- st = daysOfMonth.tailSet(new Integer(day));
+ st = daysOfMonth.tailSet(Integer.valueOf(day));
if (lastdayOfMonth) {
if(!nearestWeekday) {
t = day;
@@ -1375,7 +1375,7 @@ public class CronExpression implements S
int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
int dow = ((Integer) daysOfWeek.first()).intValue(); // desired
// d-o-w
- st = daysOfWeek.tailSet(new Integer(cDow));
+ st = daysOfWeek.tailSet(Integer.valueOf(cDow));
if (st != null && st.size() > 0) {
dow = ((Integer) st.first()).intValue();
}
@@ -1430,7 +1430,7 @@ public class CronExpression implements S
}
// get month...................................................
- st = months.tailSet(new Integer(mon));
+ st = months.tailSet(Integer.valueOf(mon));
if (st != null && st.size() != 0) {
t = mon;
mon = ((Integer) st.first()).intValue();
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java?rev=942159&r1=942158&r2=942159&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java Fri May 7 17:48:55 2010
@@ -48,6 +48,9 @@ public class UUID implements Serializabl
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object o) {
+ if (o == null) {
+ return false;
+ }
return (o.getClass() == getClass()) && ((UUID) o)._id.equals(_id);
}