--- old/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2015-10-07 21:02:09.335471746 +0200 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2015-10-07 21:02:09.007471740 +0200 @@ -2066,7 +2066,7 @@ break; case TCKind._tk_boolean: boolean booleanValue = orbStream.read_boolean(); - fieldToValueMap.put(fields[i].name, new Boolean(booleanValue)); + fieldToValueMap.put(fields[i].name, booleanValue); break; case TCKind._tk_char: // Backwards compatibility. Older Sun ORBs sent @@ -2155,8 +2155,7 @@ break; case 'Z': boolean booleanValue = orbStream.read_boolean(); - fieldToValueMap.put(fields[i].getName(), - new Boolean(booleanValue)); + fieldToValueMap.put(fields[i].getName(), booleanValue); break; case 'C': char charValue = orbStream.read_wchar(); @@ -2601,12 +2600,10 @@ } catch (Exception e) { if (o != null) { throw utilWrapper.errorSetBooleanField( e, fieldName, - o.toString(), - new Boolean(v) ) ; + o.toString(), v); } else { throw utilWrapper.errorSetBooleanField( e, fieldName, - "null " + c.getName() + " object", - new Boolean(v) ) ; + "null " + c.getName() + " object", v ); } } } --- old/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-10-07 21:02:09.811471754 +0200 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-10-07 21:02:09.723471753 +0200 @@ -57,7 +57,7 @@ * Put the value of the named boolean field into the persistent field. */ public void put(String name, boolean value){ - fields.put(name, new Boolean(value)); + fields.put(name, value); } /** --- old/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java 2015-10-07 21:02:10.283471763 +0200 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java 2015-10-07 21:02:10.151471760 +0200 @@ -42,7 +42,7 @@ * Put the value of the named boolean field into the persistent field. */ public void put(String name, boolean value){ - fields.put(name, new Boolean(value)); + fields.put(name, value); } /** --- old/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java 2015-10-07 21:02:10.703471771 +0200 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java 2015-10-07 21:02:10.607471769 +0200 @@ -132,8 +132,7 @@ { public Object read( InputStream is ) { - boolean value = is.read_boolean() ; - return new Boolean( value ) ; + return is.read_boolean() ; } public void write( OutputStream os, Object value ) --- old/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2015-10-07 21:02:11.107471778 +0200 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2015-10-07 21:02:10.963471775 +0200 @@ -54,10 +54,7 @@ public Boolean run () { String value = System.getProperty("com.sun.CORBA.transport.enableTcpKeepAlive"); - if (value != null) - return new Boolean(!"false".equalsIgnoreCase(value)); - - return Boolean.FALSE; + return (value == null) ? Boolean.FALSE : (!"false".equalsIgnoreCase(value)); } }); } --- old/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java 2015-10-07 21:02:11.559471786 +0200 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java 2015-10-07 21:02:11.411471783 +0200 @@ -209,7 +209,7 @@ { public Object operate( Object value ) { - return new Boolean( getString( value ) ) ; + return Boolean.valueOf( getString( value ) ) ; } public String toString() { return "booleanAction" ; } --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java 2015-10-07 21:02:11.955471793 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java 2015-10-07 21:02:11.819471791 +0200 @@ -1670,13 +1670,13 @@ { Boolean bool = null; if (token.name.equals ("TRUE")) - bool = new Boolean (true); + bool = Boolean.TRUE; else if (token.name.equals ("FALSE")) - bool = new Boolean (false); + bool = Boolean.FALSE; else { ParseException.invalidConst (scanner, token.name); - bool = new Boolean (false); + bool = Boolean.FALSE; } String name = token.name; match (Token.BooleanLiteral); --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java 2015-10-07 21:02:12.299471800 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java 2015-10-07 21:02:12.227471798 +0200 @@ -127,7 +127,7 @@ else { alreadyProcessedABranch.pop (); - alreadyProcessedABranch.push (new Boolean (true)); + alreadyProcessedABranch.push (Boolean.TRUE); token = scanner.getToken (); } break; @@ -328,7 +328,7 @@ expr = ((Boolean)boolExpr.value ()).booleanValue (); else expr = ((Number)boolExpr.value ()).longValue () != 0; - alreadyProcessedABranch.push (new Boolean (expr)); + alreadyProcessedABranch.push (expr); if (!expr) skipToEndiforElse (); } // constExpr @@ -537,12 +537,12 @@ if (token.equals (Token.Identifier)) if ((not && symbols.containsKey (token.name)) || (!not && !symbols.containsKey (token.name))) { - alreadyProcessedABranch.push (new Boolean (false)); + alreadyProcessedABranch.push (Boolean.FALSE); skipToEndiforElse (); } else { - alreadyProcessedABranch.push (new Boolean (true)); + alreadyProcessedABranch.push (Boolean.TRUE); match (Token.Identifier); if (inParens) match (Token.RightParen); @@ -563,12 +563,12 @@ if (token.equals (Token.Identifier)) if ((not && symbols.containsKey (token.name)) || (!not && !symbols.containsKey (token.name))) { - alreadyProcessedABranch.push (new Boolean (false)); + alreadyProcessedABranch.push (Boolean.FALSE); skipToEndiforElse (); } else { - alreadyProcessedABranch.push (new Boolean (true)); + alreadyProcessedABranch.push (Boolean.TRUE); match (Token.Identifier); } else @@ -600,7 +600,7 @@ { if (token.equals (Token.Ifdef) || token.equals (Token.Ifndef)) { - alreadyProcessedABranch.push (new Boolean (true)); + alreadyProcessedABranch.push (Boolean.TRUE); skipToEndif (); } else @@ -619,7 +619,7 @@ token = scanner.skipUntil ('#'); if (token.equals (Token.Ifdef) || token.equals (Token.Ifndef)) { - alreadyProcessedABranch.push (new Boolean (true)); + alreadyProcessedABranch.push (Boolean.TRUE); skipToEndif (); } } --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java 2015-10-07 21:02:12.607471805 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java 2015-10-07 21:02:12.515471804 +0200 @@ -269,7 +269,7 @@ static void enteringInclude () { - includeStack.push (new Boolean (setEmit)); + includeStack.push (setEmit); setEmit = false; } // enteringInclude --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java 2015-10-07 21:02:13.063471814 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java 2015-10-07 21:02:12.911471811 +0200 @@ -63,9 +63,9 @@ if (tmpL instanceof Number) { if (tmpL instanceof BigInteger) - l = new Boolean (((BigInteger)tmpL).compareTo (BigInteger.valueOf (0)) != 0); + l = ((BigInteger)tmpL).compareTo (BigInteger.valueOf (0)) != 0; else - l = new Boolean (((Number)tmpL).longValue () != 0); + l = ((Number)tmpL).longValue () != 0; } else l = (Boolean)tmpL; @@ -76,14 +76,14 @@ if (tmpR instanceof Number) { if (tmpR instanceof BigInteger) - r = new Boolean (((BigInteger)tmpR).compareTo (zero) != 0); + r = ((BigInteger)tmpR).compareTo (zero) != 0; else - r = new Boolean (((Number)tmpR).longValue () != 0); + r = ((Number)tmpR).longValue () != 0; } else r = (Boolean)tmpR; - value (new Boolean (l.booleanValue () && r.booleanValue ())); + value (Boolean.valueOf (l.booleanValue () && r.booleanValue ())); } catch (ClassCastException e) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java 2015-10-07 21:02:13.347471819 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java 2015-10-07 21:02:13.283471818 +0200 @@ -60,14 +60,14 @@ if (tmp instanceof Number) { if (tmp instanceof BigInteger) - op = new Boolean (((BigInteger)tmp).compareTo (zero) != 0); + op = ((BigInteger)tmp).compareTo (zero) != 0; else - op = new Boolean (((Number)tmp).longValue () != 0); + op = ((Number)tmp).longValue () != 0; } else op = (Boolean)tmp; - value (new Boolean (!op.booleanValue ())); + value (!op.booleanValue ()); } catch (ClassCastException e) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java 2015-10-07 21:02:13.655471824 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java 2015-10-07 21:02:13.575471823 +0200 @@ -63,9 +63,9 @@ if (tmpL instanceof Number) { if (tmpL instanceof BigInteger) - l = new Boolean (((BigInteger)tmpL).compareTo (zero) != 0); + l = ((BigInteger)tmpL).compareTo (zero) != 0; else - l = new Boolean (((Number)tmpL).longValue () != 0); + l = ((Number)tmpL).longValue () != 0; } else l = (Boolean)tmpL; @@ -76,13 +76,13 @@ if (tmpR instanceof Number) { if (tmpR instanceof BigInteger) - r = new Boolean (((BigInteger)tmpR).compareTo (BigInteger.valueOf (0)) != 0); + r = ((BigInteger)tmpR).compareTo (BigInteger.valueOf (0)) != 0; else - r = new Boolean (((Number)tmpR).longValue () != 0); + r = ((Number)tmpR).longValue () != 0; } else r = (Boolean)tmpR; - value (new Boolean (l.booleanValue () || r.booleanValue ())); + value (Boolean.valueOf (l.booleanValue () || r.booleanValue ())); } catch (ClassCastException e) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java 2015-10-07 21:02:14.039471831 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java 2015-10-07 21:02:13.943471830 +0200 @@ -56,17 +56,17 @@ { Boolean l = (Boolean)left; Boolean r = (Boolean)right ().evaluate (); - value (new Boolean (l.booleanValue () == r.booleanValue())); + value (Boolean.valueOf (l.booleanValue () == r.booleanValue())); } else { Number l = (Number)left; Number r = (Number)right ().evaluate (); if (l instanceof Float || l instanceof Double || r instanceof Float || r instanceof Double) - value (new Boolean (l.doubleValue () == r.doubleValue ())); + value (Boolean.valueOf (l.doubleValue () == r.doubleValue ())); else //daz value (new Boolean (l.longValue () == r.longValue ())); - value (new Boolean (((BigInteger)l).equals ((BigInteger)r))); + value (Boolean.valueOf (((BigInteger)l).equals ((BigInteger)r))); } } catch (ClassCastException e) --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java 2015-10-07 21:02:14.363471837 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java 2015-10-07 21:02:14.275471836 +0200 @@ -63,10 +63,10 @@ Number l = (Number)left; Number r = (Number)right ().evaluate (); if (l instanceof Float || l instanceof Double || r instanceof Float || r instanceof Double) - value (new Boolean (l.doubleValue () >= r.doubleValue ())); + value (Boolean.valueOf (l.doubleValue () >= r.doubleValue ())); else //daz value (new Boolean (l.longValue () >= r.longValue ())); - value (new Boolean ( ((BigInteger)l).compareTo ((BigInteger)r) >= 0)); + value (Boolean.valueOf ( ((BigInteger)l).compareTo ((BigInteger)r) >= 0)); } } catch (ClassCastException e) --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java 2015-10-07 21:02:14.639471842 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java 2015-10-07 21:02:14.571471841 +0200 @@ -63,10 +63,10 @@ Number l = (Number)left; Number r = (Number)right ().evaluate (); if (l instanceof Float || l instanceof Double || r instanceof Float || r instanceof Double) - value (new Boolean (l.doubleValue () > r.doubleValue ())); + value (Boolean.valueOf (l.doubleValue () > r.doubleValue ())); else //daz value (new Boolean (l.longValue () > r.longValue ())); - value (new Boolean ( ((BigInteger)l).compareTo ((BigInteger)r) > 0)); + value (Boolean.valueOf ( ((BigInteger)l).compareTo ((BigInteger)r) > 0)); } } catch (ClassCastException e) --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java 2015-10-07 21:02:14.935471848 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java 2015-10-07 21:02:14.867471847 +0200 @@ -63,10 +63,10 @@ Number l = (Number)left; Number r = (Number)right ().evaluate (); if (l instanceof Float || l instanceof Double || r instanceof Float || r instanceof Double) - value (new Boolean (l.doubleValue () <= r.doubleValue ())); + value (Boolean.valueOf (l.doubleValue () <= r.doubleValue ())); else //daz value (new Boolean (l.longValue () <= r.longValue ())); - value (new Boolean ( ((BigInteger)l).compareTo ((BigInteger)r) <= 0)); + value (Boolean.valueOf ( ((BigInteger)l).compareTo ((BigInteger)r) <= 0)); } } catch (ClassCastException e) --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java 2015-10-07 21:02:15.223471853 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java 2015-10-07 21:02:15.139471851 +0200 @@ -63,10 +63,10 @@ Number l = (Number)left; Number r = (Number)right ().evaluate (); if (l instanceof Float || l instanceof Double || r instanceof Float || r instanceof Double) - value (new Boolean (l.doubleValue () < r.doubleValue ())); + value (Boolean.valueOf (l.doubleValue () < r.doubleValue ())); else //daz value (new Boolean (l.longValue () < r.longValue ())); - value (new Boolean (((BigInteger)l).compareTo ((BigInteger)r) < 0)); + value (Boolean.valueOf (((BigInteger)l).compareTo ((BigInteger)r) < 0)); } } catch (ClassCastException e) --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java 2015-10-07 21:02:15.511471858 +0200 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java 2015-10-07 21:02:15.427471857 +0200 @@ -56,7 +56,7 @@ { Boolean l = (Boolean)left; Boolean r = (Boolean)right ().evaluate (); - value (new Boolean (l.booleanValue () != r.booleanValue())); + value (Boolean.valueOf (l.booleanValue () != r.booleanValue())); } else { @@ -64,10 +64,10 @@ Number r = (Number)right ().evaluate (); if (l instanceof Float || l instanceof Double || r instanceof Float || r instanceof Double) - value (new Boolean (l.doubleValue () != r.doubleValue ())); + value (Boolean.valueOf (l.doubleValue () != r.doubleValue ())); else //daz value (new Boolean (l.longValue () != r.longValue ())); - value (new Boolean (!((BigInteger)l).equals ((BigInteger)r))); + value (Boolean.valueOf (!((BigInteger)l).equals ((BigInteger)r))); } } catch (ClassCastException e)