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

[<nr...@us...>]

Revision: 6963
          http://jython.svn.sourceforge.net/jython/?rev=6963&view=rev
Author:   nriley
Date:     2010-01-24 01:15:55 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
Better handle errors where a BufferedReader cannot be constructed while parsing (i.e., there are issues with underlying Reader).  Partially addresses #1536.

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

Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java	2010-01-23 22:58:13 UTC (rev 6962)
+++ trunk/jython/src/org/python/core/ParserFacade.java	2010-01-24 01:15:55 UTC (rev 6963)
@@ -118,8 +118,10 @@
         try {
             bufReader = prepBufReader(reader, cflags, filename);
             // first, try parsing as an expression
-            return parse(bufReader, CompileMode.eval, filename, cflags );
+            return parse(bufReader, CompileMode.eval, filename, cflags);
         } catch (Throwable t) {
+            if (bufReader == null)
+                throw Py.JavaError(t); // can't do any more
             try {
                 // then, try parsing as a module
                 bufReader.reset();
@@ -128,7 +130,8 @@
                 throw fixParseError(bufReader, tt, filename);
             }
         } finally {
-            close(bufReader);
+            if (bufReader != null)
+                close(bufReader);
         }
     }
 


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