svn commit: r1357420 - in /hama/trunk/core/src/main/java/org/apache/hama/util: BSPServletUtil.java Bytes.java

[to...@apache.org]

Author: tommaso
Date: Wed Jul  4 21:39:18 2012
New Revision: 1357420

URL: http://svn.apache.org/viewvc?rev=1357420&view=rev
Log:
[HAMA-572] - simplifying boolean clause and avoiding String concatenation while using StringBuilder)

Modified:
    hama/trunk/core/src/main/java/org/apache/hama/util/BSPServletUtil.java
    hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java

Modified: hama/trunk/core/src/main/java/org/apache/hama/util/BSPServletUtil.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/util/BSPServletUtil.java?rev=1357420&r1=1357419&r2=1357420&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/util/BSPServletUtil.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/util/BSPServletUtil.java Wed Jul  4 21:39:18 2012
@@ -17,17 +17,17 @@
  */
 package org.apache.hama.util;
 
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map.Entry;
-
 import org.apache.hadoop.util.ServletUtil;
 import org.apache.hama.bsp.BSPMaster;
 import org.apache.hama.bsp.ClusterStatus;
 import org.apache.hama.bsp.GroomServerStatus;
 import org.apache.hama.bsp.JobStatus;
 
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Map.Entry;
+
 public class BSPServletUtil extends ServletUtil {
 
   public static final String HTML_TAIL = "<hr />\n"
@@ -103,7 +103,7 @@ public class BSPServletUtil extends Serv
     for (Entry<String, GroomServerStatus> entry : status
         .getActiveGroomServerStatus().entrySet()) {
       sb.append("<tr><td>");
-      sb.append("<a href='http://" + entry.getKey() + "'>");
+      sb.append("<a href='http://").append(entry.getKey()).append("'>");
       sb.append(entry.getKey()).append("</a></td><td>");
       sb.append(entry.getValue().getGroomHostName()).append("</td>").append(
           "<td>").append(entry.getValue().getMaxTasks()).append("</td><td>");

Modified: hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java?rev=1357420&r1=1357419&r2=1357420&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java Wed Jul  4 21:39:18 2012
@@ -17,6 +17,13 @@
  */
 package org.apache.hama.util;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.io.RawComparator;
+import org.apache.hadoop.io.WritableComparator;
+import org.apache.hadoop.io.WritableUtils;
+import org.apache.hama.Constants;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -25,13 +32,6 @@ import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.io.RawComparator;
-import org.apache.hadoop.io.WritableComparator;
-import org.apache.hadoop.io.WritableUtils;
-import org.apache.hama.Constants;
-
 /**
  * Utility class that handles byte arrays, conversions to/from other types,
  * comparisons, hash code generation, manufacturing keys for HashMaps or
@@ -892,10 +892,7 @@ public class Bytes {
   public static boolean equals(final byte[] left, final byte[] right) {
     // Could use Arrays.equals?
     // noinspection SimplifiableConditionalExpression
-    if (left == null && right == null) {
-      return true;
-    }
-    return (!(left == null || right == null || (left.length != right.length)) && compareTo(left, right) == 0);
+    return left == null && right == null || (!(left == null || right == null || (left.length != right.length)) && compareTo(left, right) == 0);
   }
 
   /**