From 46448a690cda87d152b87d72bcff5694dc36918a Mon Sep 17 00:00:00 2001
From: Joerg Schaible <joehni@apache.org>
Date: Wed, 3 Oct 2012 15:26:13 +0000
Subject: [PATCH] Simplify expressions again.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1393539 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/commons/lang3/Conversion.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java
index 87a372878..4d2f60f1f 100644
--- a/src/main/java/org/apache/commons/lang3/Conversion.java
+++ b/src/main/java/org/apache/commons/lang3/Conversion.java
@@ -597,8 +597,8 @@ public static long intsToLong(int[] src, int srcPos, long dstInit, int dstPos, i
         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 static long boolsToLong(boolean[] src, int srcPos, long dstInit, int dstP
         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 static int boolsToInt(boolean[] src, int srcPos, int dstInit, int dstPos,
         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 static short boolsToShort(boolean[] src, int srcPos, short dstInit, int d
         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 static byte boolsToByte(boolean[] src, int srcPos, byte dstInit, int dstP
         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);
         }