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 2013/04/25 15:36:12 UTC
svn commit: r1475762 - in
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/impl/RsLang.java analysis_engine/impl/RsLangs.java
cas/impl/BinaryCasSerDes6.java cas/impl/CASImpl.java
internal/util/rb_trees/IntArrayRBT.java
Author: schor
Date: Thu Apr 25 13:36:11 2013
New Revision: 1475762
URL: http://svn.apache.org/r1475762
Log:
No Jira - findbugs slight improvements
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java?rev=1475762&r1=1475761&r2=1475762&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java Thu Apr 25 13:36:11 2013
@@ -38,6 +38,7 @@ public class RsLang {
* @param language
* @return x-unspecified if lang is null or a canonical version of the lang string
*/
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings("DM_STRING_CTOR")
static String getCanonicalLanguageString(String language) {
if (language == null || language.equals(Language.UNSPECIFIED_LANGUAGE)) { // represents x-unspecified
return Language.UNSPECIFIED_LANGUAGE;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java?rev=1475762&r1=1475761&r2=1475762&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java Thu Apr 25 13:36:11 2013
@@ -120,6 +120,8 @@ public class RsLangs {
* @param lang
* @return true if any of the rsLangs subsumes the param lang
*/
+
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
static boolean subsumesCanonical(RsLangs rsl, String lang) {
if (null == rsl || null == rsl.languages) { // don't test for size() == 0 - that's used by replace to indicate empty, not x-unspec
return true; // x-unspecified subsumes all
@@ -152,6 +154,7 @@ public class RsLangs {
return false;
}
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
private static boolean subsumesCanonical(String containingLang, String langToTest, String langToTestBase) {
return containingLang == langToTest || containingLang == langToTestBase;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1475762&r1=1475761&r2=1475762&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java Thu Apr 25 13:36:11 2013
@@ -2205,10 +2205,11 @@ public class BinaryCasSerDes6 {
// }
}
- private void skipBytes(DataInputStream stream, int skipNumber) throws IOException {
+ static void skipBytes(DataInputStream stream, int skipNumber) throws IOException {
final int r = stream.skipBytes(skipNumber);
- if (r == 0) {
- throw new IOException("0 bytes skipped, causing out-of-synch while deserializing");
+ if (r != skipNumber) {
+ throw new IOException(String.format("%d bytes skipped when %d was requested, causing out-of-synch while deserializing from stream %s",
+ r, skipNumber, stream));
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1475762&r1=1475761&r2=1475762&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Thu Apr 25 13:36:11 2013
@@ -1284,7 +1284,7 @@ public class CASImpl extends AbstractCas
if (!delta) {
this.getByteHeap().heap = new byte[Math.max(16, heapsz)]; // must be > 0
- dis.read(this.getByteHeap().heap, 0, heapsz);
+ dis.readFully(this.getByteHeap().heap, 0, heapsz);
this.getByteHeap().heapPos = heapsz;
} else {
for (int i=0; i < heapsz; i++) {
@@ -1293,7 +1293,7 @@ public class CASImpl extends AbstractCas
}
// word alignment
int align = (4 - (heapsz % 4)) % 4;
- dis.skipBytes(align);
+ BinaryCasSerDes6.skipBytes(dis, align);
// short heap
heapsz = readInt(dis, swap);
@@ -1343,7 +1343,7 @@ public class CASImpl extends AbstractCas
}
// word alignment
align = (4 - (heapsz % 4)) % 4;
- dis.skipBytes(align);
+ BinaryCasSerDes6.skipBytes(dis, align);
//modified Short Heap
heapsz = readInt(dis, swap);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java?rev=1475762&r1=1475761&r2=1475762&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java Thu Apr 25 13:36:11 2013
@@ -244,8 +244,9 @@ public class IntArrayRBT {
*/
public int compareTo(Object o) {
ComparableIterator it = (ComparableIterator) o;
- return this.comparator.compare(IntArrayRBT.this.getKey(this.currentNode), it
- .getKey(it.currentNode));
+ return this.comparator.compare(
+ IntArrayRBT.this.getKey(this.currentNode),
+ IntArrayRBT.this.getKey(it.currentNode));
}
}