Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C6C31D768 for ; Wed, 3 Oct 2012 15:27:00 +0000 (UTC) Received: (qmail 36575 invoked by uid 500); 3 Oct 2012 15:27:00 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 36480 invoked by uid 500); 3 Oct 2012 15:26:59 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 36470 invoked by uid 99); 3 Oct 2012 15:26:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2012 15:26:59 +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; Wed, 03 Oct 2012 15:26:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 896132388900 for ; Wed, 3 Oct 2012 15:26:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1393539 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Conversion.java Date: Wed, 03 Oct 2012 15:26:13 -0000 To: commits@commons.apache.org From: joehni@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121003152613.896132388900@eris.apache.org> Author: joehni Date: Wed Oct 3 15:26:13 2012 New Revision: 1393539 URL: http://svn.apache.org/viewvc?rev=1393539&view=rev Log: Simplify expressions again. Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Conversion.java Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Conversion.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Conversion.java?rev=1393539&r1=1393538&r2=1393539&view=diff ============================================================================== --- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Conversion.java (original) +++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Conversion.java Wed Oct 3 15:26:13 2012 @@ -597,8 +597,8 @@ public class Conversion { for (int i = 0; i < nInts; i++ ) { shift = i * 32 + dstPos; long bits = ((0xffffffffL & src[i + srcPos]) << shift); - long mask = (0xffffffffL << shift); - out = ((out & ~mask) | bits); + long mask = 0xffffffffL << shift; + out = (out & ~mask) | bits; } return out; } @@ -919,7 +919,7 @@ public class Conversion { int shift = 0; for (int i = 0; i < nBools; i++ ) { shift = i * 1 + dstPos; - long bits = (0x1L & ((src[i + srcPos]) ? 1 : 0)) << shift; + long bits = (src[i + srcPos] ? 1L : 0) << shift; long mask = 0x1L << shift; out = (out & ~mask) | bits; } @@ -951,7 +951,7 @@ public class Conversion { int shift = 0; for (int i = 0; i < nBools; i++ ) { shift = i * 1 + dstPos; - int bits = (0x1 & ((src[i + srcPos]) ? 1 : 0)) << shift; + int bits = (src[i + srcPos] ? 1 : 0) << shift; int mask = 0x1 << shift; out = (out & ~mask) | bits; } @@ -984,7 +984,7 @@ public class Conversion { int shift = 0; for (int i = 0; i < nBools; i++ ) { shift = i * 1 + dstPos; - int bits = (0x1 & ((src[i + srcPos]) ? 1 : 0)) << shift; + int bits = (src[i + srcPos] ? 1 : 0) << shift; int mask = 0x1 << shift; out = (short)((out & ~mask) | bits); } @@ -1017,7 +1017,7 @@ public class Conversion { int shift = 0; for (int i = 0; i < nBools; i++ ) { shift = i * 1 + dstPos; - int bits = (0x1 & ((src[i + srcPos]) ? 1 : 0)) << shift; + int bits = (src[i + srcPos] ? 1 : 0) << shift; int mask = 0x1 << shift; out = (byte)((out & ~mask) | bits); }