git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-2110_makeSenseOfCrossRef
[jalview.git]
/
src
/
ext
/
vamsas
/
ServiceHandle.java
diff --git
a/src/ext/vamsas/ServiceHandle.java
b/src/ext/vamsas/ServiceHandle.java
index
442e5f7
..
83412ea
100755
(executable)
--- a/
src/ext/vamsas/ServiceHandle.java
+++ b/
src/ext/vamsas/ServiceHandle.java
@@
-128,15
+128,15
@@
public class ServiceHandle implements java.io.Serializable
public synchronized boolean equals(java.lang.Object obj)
{
public synchronized boolean equals(java.lang.Object obj)
{
- if (!(obj instanceof ServiceHandle))
+ if (obj == null)
{
return false;
}
{
return false;
}
- ServiceHandle other = (ServiceHandle) obj;
- if (obj == null)
+ if (!(obj instanceof ServiceHandle))
{
return false;
}
{
return false;
}
+ ServiceHandle other = (ServiceHandle) obj;
if (this == obj)
{
return true;
if (this == obj)
{
return true;