### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.compiler Index: src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java,v retrieving revision 1.39 diff -u -r1.39 NullReferenceTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java 29 Aug 2006 08:34:29 -0000 1.39 +++ src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java 19 Sep 2006 06:59:34 -0000 @@ -5022,8 +5022,8 @@ } // null analysis - do while -// TODO (maxime) https://bugs.eclipse.org/bugs/show_bug.cgi?id=147118 -public void _test0613_do_while() { +// https://bugs.eclipse.org/bugs/show_bug.cgi?id=147118 +public void test0613_do_while() { this.runConformTest( new String[] { "X.java", #P org.eclipse.jdt.core Index: compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java,v retrieving revision 1.53 diff -u -r1.53 DoStatement.java --- compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java 15 Jun 2006 10:33:04 -0000 1.53 +++ compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java 19 Sep 2006 06:59:36 -0000 @@ -92,13 +92,12 @@ if (!isConditionOptimizedFalse && this.continueLabel != null) { loopingContext.complainOnDeferredFinalChecks(currentScope, condInfo); condLoopContext.complainOnDeferredFinalChecks(currentScope, condInfo); - UnconditionalFlowInfo checkFlowInfo; loopingContext.complainOnDeferredNullChecks(currentScope, - checkFlowInfo = actionInfo. - addPotentialNullInfoFrom( + flowInfo.unconditionalCopy().addPotentialNullInfoFrom( condInfo.initsWhenTrue().unconditionalInits())); condLoopContext.complainOnDeferredNullChecks(currentScope, - checkFlowInfo); + actionInfo.addPotentialNullInfoFrom( + condInfo.initsWhenTrue().unconditionalInits())); } // end of loop