Graph/JOGL: Avoid NPE

2 files changed, 8 insertions, 2 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
index b0ad86fda..6c1557f7b 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
@@ -154,7 +154,7 @@ public class Outline implements Cloneable, Comparable<Outline> {
      */
     public final void setClosed(boolean closed) {
         this.closed = closed;
-        if(closed){
+        if( closed && !isEmpty() ) {
             Vertex first = vertices.get(0);
             Vertex last = getLastVertex();
             if(!VectorUtil.checkEquality(first.getCoord(), last.getCoord())){
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());