You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/12/07 17:06:33 UTC
svn commit: r1773121 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl:
BinaryCasSerDes4.java CASImpl.java UimaDecompiler.java
Author: schor
Date: Wed Dec 7 17:06:33 2016
New Revision: 1773121
URL: http://svn.apache.org/viewvc?rev=1773121&view=rev
Log:
no Jira, findbugs fixes
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/UimaDecompiler.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java?rev=1773121&r1=1773120&r2=1773121&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java Wed Dec 7 17:06:33 2016
@@ -520,6 +520,7 @@ public class BinaryCasSerDes4 implements
this.prevFsByType = new TOP[ts.getTypeArraySize()];
csds = getCsds(baseCas, isDelta);
+ assert null != csds;
}
/**
@@ -2994,7 +2995,10 @@ public class BinaryCasSerDes4 implements
(null == tmpCsds || tmpCsds.isEmpty()) ) {
tmpCsds = cas.newCsds();
tmpCsds.setup(null, 1);
- }
+ } else {
+ assert null != tmpCsds;
+ }
+
return tmpCsds;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1773121&r1=1773120&r2=1773121&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Wed Dec 7 17:06:33 2016
@@ -273,6 +273,8 @@ public class CASImpl extends AbstractCas
@Override
public boolean equals(Object obj) {
+ if (obj == null || !(obj instanceof FsChange))
+ return false;
return ((FsChange)obj).fs._id == fs._id;
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/UimaDecompiler.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/UimaDecompiler.java?rev=1773121&r1=1773120&r2=1773121&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/UimaDecompiler.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/UimaDecompiler.java Wed Dec 7 17:06:33 2016
@@ -178,7 +178,7 @@ public class UimaDecompiler {
*/
public String decompile(byte[] b) {
- PlainTextOutput pto = new PlainTextOutput();
+// PlainTextOutput pto = new PlainTextOutput();
String classNameSlashes = extractClassNameSlashes(b);
// setDecompilerSettingsForByteArray(classNameSlashes, b);