--- a/make/sun/module/osgi/Makefile	Tue Jul 22 17:55:50 2008 -0700
+++ b/make/sun/module/osgi/Makefile	Tue Jul 22 23:22:36 2008 -0700
@@ -61,7 +61,12 @@ ifdef OSGI_FRAMEWORK_JAR
   #
   # Temporary workaround to include the OSGi framework
   # and Felix OSGi container for compilation.
+ifeq ($(PLATFORM),windows)
+  OTHER_JAVACFLAGS = -cp $(OSGI_FRAMEWORK_JAR);$(FELIX_JAR)
+else # PLATFORM
   OTHER_JAVACFLAGS = -cp $(OSGI_FRAMEWORK_JAR):$(FELIX_JAR)
+endif
+
 endif
 
 #

--- a/src/share/classes/sun/module/repository/RepositoryConfig.java	Tue Jul 22 17:55:50 2008 -0700
+++ b/src/share/classes/sun/module/repository/RepositoryConfig.java	Tue Jul 22 23:22:36 2008 -0700
@@ -103,6 +103,9 @@ public final class RepositoryConfig
     /** True once configRepositories has completed. */
     private static boolean configDone = false;
 
+    /** True once the repositories are all initialized. */
+    private static boolean initialized = false;
+
     /** Last repository in the configuration. */
     private static Repository lastRepository;
 
@@ -172,6 +175,7 @@ public final class RepositoryConfig
             systemRepository = configRepositories();
         }
         // XXX: Will revisit the bootstrapping issue
+        //
         // During the VM startup, we can only initialize the repositories
         // provided by rt.jar (loaded by bootstrap class loader).
         // This method may be called when initializing the application class
@@ -179,7 +183,8 @@ public final class RepositoryConfig
         // (classes not loaded by bootstrap class loader) may result
         // in a deadlock if loaded by the application class loader.
         //
-        if (initializeAll) {
+        if (initializeAll && !initialized) {
+            initialized = true;
             for (Repository r = systemRepository; r != null; r = r.getParent()) {
                 try {
                     if (!r.isActive()) {