revert cfc7b01

impl/src/main/java/com/sun/faces/lifecycle/ClientWindowFactoryImpl.java

@@ -32,7 +32,6 @@ public class ClientWindowFactoryImpl extends ClientWindowFactory {
 
     private boolean isClientWindowEnabled = false;
     private WebConfiguration config = null;
-    private final TokenGenerator tokenGenerator = new TokenGenerator();
 
     public ClientWindowFactoryImpl() {
         super(null);
@@ -45,16 +44,6 @@ public ClientWindowFactoryImpl(boolean ignored) {
         isClientWindowEnabled = false;
     }
 
-
-    @Override
-    public ClientWindow getClientWindow(FacesContext context) {
-        if (!isClientWindowEnabled) {
-            return null;
-        }
-
-        return new ClientWindowImpl(tokenGenerator);
-    }
-
     private class PostConstructApplicationListener implements SystemEventListener {
 
         @Override
@@ -77,4 +66,13 @@ private void postConstructApplicationInitialization() {
 
         isClientWindowEnabled = null != optionValue && "url".equals(optionValue);
     }
+
+    @Override
+    public ClientWindow getClientWindow(FacesContext context) {
+        if (!isClientWindowEnabled) {
+            return null;
+        }
+
+        return new ClientWindowImpl();
+    }
 }