From 2c5bdd6b2810d9fd19f358d92cf63e03cefeec2d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 8 May 2011 05:32:14 +0200
Subject: Graph/JOGL: Avoid NPE
---
src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'src/jogl/classes/com/jogamp/opengl/util/glsl')
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
index a5290b958..e51998a87 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -942,7 +942,13 @@ public class ShaderState {
}
sb.append("ShaderState[ ");
- sb.append(Platform.getNewline()).append(" ").append(shaderProgram.toString());
+
+ sb.append(Platform.getNewline()).append(" ");
+ if(null != shaderProgram) {
+ shaderProgram.toString(sb);
+ } else {
+ sb.append("ShaderProgram: null");
+ }
sb.append(Platform.getNewline()).append(" enabledAttributes [");
for(Iterator<String> iter = enabledAttributes.iterator(); iter.hasNext(); ) {
sb.append(Platform.getNewline()).append(" ").append(iter.next());
--
cgit v1.2.3