You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by we...@apache.org on 2010/02/18 11:28:26 UTC

svn commit: r911312 - /myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java

Author: werpu
Date: Thu Feb 18 10:28:25 2010
New Revision: 911312

URL: http://svn.apache.org/viewvc?rev=911312&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-64

finalizing the npe fixup

Modified:
    myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java

Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java?rev=911312&r1=911311&r2=911312&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java Thu Feb 18 10:28:25 2010
@@ -182,8 +182,12 @@
         retVal.append(diagnostic.getLineNumber());
 
         retVal.append("\n\n");
-        String source = diagnostic.getSource().toString();
-        source = (source == null) ? "No source info" : source;
+
+        String source = "No additional source info";
+
+        if(diagnostic.getSource() != null) {
+            source = diagnostic.getSource().toString();
+        }
         retVal.append(source);
 
         return retVal.toString();