1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
index 4eb4c6182b1..bcfacd008f0 100644
--- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java
+++ b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
@@ -132,9 +132,11 @@ public class IntegerGraphicsState extends AbstractGraphicsState
 
   public Shape getClip()
   {
+    if (clip == null)
+      return null;
     if (clip instanceof Rectangle)
       {
-	Rectangle clipRect = (Rectangle) clip;
+	Rectangle clipRect = (Rectangle) ((Rectangle) clip).clone();
 	clipRect.x -= tx;
 	clipRect.y -= ty;
 	return clipRect;
@@ -149,6 +151,8 @@ public class IntegerGraphicsState extends AbstractGraphicsState
 
   public Rectangle getClipBounds()
   {
+    if (clip == null)
+      return null;
     Rectangle clipRect = clip.getBounds();
     
     clipRect.x -= tx;