You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by rf...@apache.org on 2011/03/01 22:06:35 UTC
svn commit: r1076031 -
/incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java
Author: rfrovarp
Date: Tue Mar 1 22:06:34 2011
New Revision: 1076031
URL: http://svn.apache.org/viewvc?rev=1076031&view=rev
Log:
Technically using non-short circuiting logic should be fine.
However, it is confusing and trips code detectors.
Modified:
incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java
Modified: incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java?rev=1076031&r1=1076030&r2=1076031&view=diff
==============================================================================
--- incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java (original)
+++ incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java Tue Mar 1 22:06:34 2011
@@ -42,7 +42,7 @@ public class EchoHandler extends Default
* @param encoding
*/
public EchoHandler(String encoding) {
- if (null != encoding & !" ".equals(encoding)) {
+ if (null != encoding && !" ".equals(encoding)) {
this.encoding = encoding;
} else {
this.encoding = "UTF-8";
@@ -217,4 +217,4 @@ public class EchoHandler extends Default
public String toString() {
return xmlBuffer.toString();
}
-}
\ No newline at end of file
+}