[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3400] trunk/LWJGL/src/java/org/lwjgl/util/ generator/JavaMethodsGenerator.java

[<sp...@us...>]

Revision: 3400
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3400&view=rev
Author:   spasi
Date:     2010-08-16 22:09:01 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
Fixed NPE when safeNewBuffer returns NULL.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-07-31 16:14:13 UTC (rev 3399)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-08-16 22:09:01 UTC (rev 3400)
@@ -263,7 +263,7 @@
 		if (has_result) {
 			if ( method.getAnnotation(GLreturn.class) == null ) {
 				if ( ByteBuffer.class.equals(Utils.getJavaType(result_type)) )
-					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
+					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
 				else
 					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ";");
 			} else


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