From 3e698786bedbcf0cf46a4c8112d035daaa923d2c Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Mon, 16 Aug 2010 22:09:01 +0000 Subject: [PATCH] Fixed NPE when safeNewBuffer returns NULL. --- src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java index 456770c8..416b754a 100644 --- a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java +++ b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java @@ -263,7 +263,7 @@ public class JavaMethodsGenerator { 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