src/windows/native/sun/windows/awt_ScrollPane.cpp

rev 12527 : 8165543: Better window framing
Reviewed-by: serb

*** 94,107 ****
              return NULL;
          }
  
          PDATA pData;
          AwtComponent* awtParent;
-         JNI_CHECK_PEER_GOTO(parent, done);
  
          awtParent = (AwtComponent*)pData;
-         JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
  
          target = env->GetObjectField(self, AwtObject::targetID);
          JNI_CHECK_NULL_GOTO(target, "null target", done);
  
          c = new AwtScrollPane();
--- 94,106 ----
              return NULL;
          }
  
          PDATA pData;
          AwtComponent* awtParent;
  
+         JNI_CHECK_PEER_GOTO(parent, done);
          awtParent = (AwtComponent*)pData;
  
          target = env->GetObjectField(self, AwtObject::targetID);
          JNI_CHECK_NULL_GOTO(target, "null target", done);
  
          c = new AwtScrollPane();
*** 677,691 ****
  {
      TRY;
  
      DTRACE_PRINTLN2("%x: WScrollPanePeer.create(%x)", self, parent);
  
-     PDATA pData;
-     JNI_CHECK_PEER_RETURN(parent);
      AwtToolkit::CreateComponent(self, parent,
                                  (AwtToolkit::ComponentFactory)
                                  AwtScrollPane::Create);
      JNI_CHECK_PEER_CREATION_RETURN(self);
      ((AwtScrollPane*)pData)->VerifyState();
  
      CATCH_BAD_ALLOC;
  }
--- 676,689 ----
  {
      TRY;
  
      DTRACE_PRINTLN2("%x: WScrollPanePeer.create(%x)", self, parent);
  
      AwtToolkit::CreateComponent(self, parent,
                                  (AwtToolkit::ComponentFactory)
                                  AwtScrollPane::Create);
+     PDATA pData;
      JNI_CHECK_PEER_CREATION_RETURN(self);
      ((AwtScrollPane*)pData)->VerifyState();
  
      CATCH_BAD_ALLOC;
  }