Return-Path: X-Original-To: apmail-hama-commits-archive@www.apache.org Delivered-To: apmail-hama-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D6F8ACE21 for ; Mon, 28 May 2012 11:47:33 +0000 (UTC) Received: (qmail 30899 invoked by uid 500); 28 May 2012 11:47:33 -0000 Delivered-To: apmail-hama-commits-archive@hama.apache.org Received: (qmail 30828 invoked by uid 500); 28 May 2012 11:47:31 -0000 Mailing-List: contact commits-help@hama.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hama.apache.org Delivered-To: mailing list commits@hama.apache.org Received: (qmail 30799 invoked by uid 500); 28 May 2012 11:47:30 -0000 Delivered-To: apmail-incubator-hama-commits@incubator.apache.org Received: (qmail 30791 invoked by uid 99); 28 May 2012 11:47:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 May 2012 11:47:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 May 2012 11:47:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7AEAA2388978; Mon, 28 May 2012 11:47:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1343208 - in /incubator/hama/trunk/core/src/main/java/org/apache/hama/util: Bytes.java RunJar.java VersionInfo.java Date: Mon, 28 May 2012 11:47:06 -0000 To: hama-commits@incubator.apache.org From: tommaso@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120528114706.7AEAA2388978@eris.apache.org> Author: tommaso Date: Mon May 28 11:47:05 2012 New Revision: 1343208 URL: http://svn.apache.org/viewvc?rev=1343208&view=rev Log: [HAMA-572] - minor tweaks in util package of core module Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java incubator/hama/trunk/core/src/main/java/org/apache/hama/util/RunJar.java incubator/hama/trunk/core/src/main/java/org/apache/hama/util/VersionInfo.java Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java?rev=1343208&r1=1343207&r2=1343208&view=diff ============================================================================== --- incubator/hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java (original) +++ incubator/hama/trunk/core/src/main/java/org/apache/hama/util/Bytes.java Mon May 28 11:47:05 2012 @@ -889,8 +889,7 @@ public class Bytes { if (left == null && right == null) { return true; } - return (left == null || right == null || (left.length != right.length) ? false - : compareTo(left, right) == 0); + return (!(left == null || right == null || (left.length != right.length)) && compareTo(left, right) == 0); } /** Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/util/RunJar.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/util/RunJar.java?rev=1343208&r1=1343207&r2=1343208&view=diff ============================================================================== --- incubator/hama/trunk/core/src/main/java/org/apache/hama/util/RunJar.java (original) +++ incubator/hama/trunk/core/src/main/java/org/apache/hama/util/RunJar.java Mon May 28 11:47:05 2012 @@ -48,7 +48,7 @@ public class RunJar { try { Enumeration entries = jar.entries(); while (entries.hasMoreElements()) { - JarEntry entry = (JarEntry) entries.nextElement(); + JarEntry entry = entries.nextElement(); if (!entry.isDirectory()) { InputStream in = jar.getInputStream(entry); try { @@ -132,7 +132,7 @@ public class RunJar { classPath.add(lib.toURI().toURL()); } } - ClassLoader loader = new URLClassLoader((URL[]) classPath + ClassLoader loader = new URLClassLoader(classPath .toArray(new URL[classPath.size()])); Thread.currentThread().setContextClassLoader(loader); @@ -141,7 +141,7 @@ public class RunJar { String.class, 0).getClass() }); List var = Arrays.asList(args).subList(firstArg, args.length); - String[] newArgs = (String[]) var.toArray(new String[var.size()]); + String[] newArgs = var.toArray(new String[var.size()]); try { main.invoke(null, new Object[] { newArgs }); } catch (InvocationTargetException e) { Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/util/VersionInfo.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/util/VersionInfo.java?rev=1343208&r1=1343207&r2=1343208&view=diff ============================================================================== --- incubator/hama/trunk/core/src/main/java/org/apache/hama/util/VersionInfo.java (original) +++ incubator/hama/trunk/core/src/main/java/org/apache/hama/util/VersionInfo.java Mon May 28 11:47:05 2012 @@ -30,8 +30,8 @@ public class VersionInfo { private static final Log LOG = LogFactory.getLog(VersionInfo.class); - private static Package myPackage; - private static HamaVersionAnnotation version; + private static final Package myPackage; + private static final HamaVersionAnnotation version; static { myPackage = HamaVersionAnnotation.class.getPackage();