[Jython-checkins] SF.net SVN: jython:[6417] trunk/jython/src/org/python/core/PySystemState. java

[<pj...@us...>]

Revision: 6417
          http://jython.svn.sourceforge.net/jython/?rev=6417&view=rev
Author:   pjenvey
Date:     2009-05-29 01:46:19 +0000 (Fri, 29 May 2009)

Log Message:
-----------
don't try putting null into this Hashtable

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PySystemState.java

Modified: trunk/jython/src/org/python/core/PySystemState.java
===================================================================
--- trunk/jython/src/org/python/core/PySystemState.java	2009-05-28 13:37:28 UTC (rev 6416)
+++ trunk/jython/src/org/python/core/PySystemState.java	2009-05-29 01:46:19 UTC (rev 6417)
@@ -660,7 +660,9 @@
             } catch (SecurityException se) {
                 encoding = null;
             }
-            registry.put(PYTHON_CONSOLE_ENCODING, encoding);
+            if (encoding != null) {
+                registry.put(PYTHON_CONSOLE_ENCODING, encoding);
+            }
         }
         // Set up options from registry
         Options.setFromRegistry();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.