# HG changeset patch
# User Jan Lahoda <jlahoda@netbeans.org>
# Date 1217947311 -7200
# Node ID d2c6db0124b8e22a032a27230a97928c13c703b9
# Parent  82d2468af8e7c5c41b179ac6f42e2a58c293ee23
(transplanted from d9f8d2ce40c05ec77e81ac06177dba74ba0399a3)

diff --git a/java.source/src/org/netbeans/modules/java/source/usages/RepositoryUpdater.java b/java.source/src/org/netbeans/modules/java/source/usages/RepositoryUpdater.java
--- a/java.source/src/org/netbeans/modules/java/source/usages/RepositoryUpdater.java
+++ b/java.source/src/org/netbeans/modules/java/source/usages/RepositoryUpdater.java
@@ -3127,19 +3127,7 @@
                             Map<ElementHandle, Collection<String>> members = RebuildOraculum.sortOut(jt.getElements(), types);
                             toRecompile.addAll(RebuildOraculum.get().findFilesToRebuild(rootFile, activeTuple.file.toURI().toURL(), cpInfo, members));
                         }
-
-                        Iterable<? extends JavaFileObject> generatedFiles;
-                        boolean clearJavac = false;
-
-                        if (activeTuple.file != null && "package-info.java".equals(activeTuple.file.getName())) {
-                            //XXX: "types" are empty for package-info. will generate everything and use new javac to process the rest of the files:
-                            generatedFiles = jt.generate();
-                            clearJavac = true;
-                        } else {
-                            generatedFiles = jt.generate(types);
-                        }
-
-                        for (JavaFileObject generated : generatedFiles) {   //Analyzing genlist may be a bit faster
+                        for (JavaFileObject generated : jt.generate(types)) {   //Analyzing genlist may be a bit faster
                             if (generated instanceof OutputFileObject) {
                                 if (addedFiles != null) {
                                     addedFiles.add(((OutputFileObject) generated).getFile());
@@ -3148,15 +3136,6 @@
                                 //XXX: log (presumably should not happen)
                             }
                         }
-
-                        if (clearJavac) {
-                            if (jt != null) {
-                                jt.finish();
-                            }
-                            jt = null;
-                            listener.cleanDiagnostics();
-                        }
-                        
                         activeTuple = null;
                         state  = 0;
                     } catch (CouplingAbort a) {
diff --git a/libs.javacimpl/external/javac-impl-nb-7.0-b07.jar b/libs.javacimpl/external/javac-impl-nb-7.0-b07.jar
--- a/libs.javacimpl/external/javac-impl-nb-7.0-b07.jar
+++ b/libs.javacimpl/external/javac-impl-nb-7.0-b07.jar
@@ -1,1 +1,1 @@
-<<<EXTERNAL 364D7C957FE35837E20DDBFC2C04CE82A3145DF2-javac-impl-nb-7.0-b07.jar>>>
+<<<EXTERNAL E430FAF8368BE289F38C07641F4411BE6D740165-javac-impl-nb-7.0-b07.jar>>>