harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r495654 - in /harmony/enhanced/classlib/trunk/modules/awt: make/ src/main/java/common/java/awt/dnd/ src/test/api/java/common/java/awt/dnd/
Date Fri, 12 Jan 2007 17:34:04 GMT
Author: ayza
Date: Fri Jan 12 09:34:02 2007
New Revision: 495654

URL: http://svn.apache.org/viewvc?view=rev&rev=495654
Log:
Applying patch from HARMONY-2492 ([classlib][awt] java.awt.dnd.addNotify(null) throws NPE
while RI doesn't). DropTargetTest is enabled since all tests pass (at least on Windows)

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTarget.java
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/dnd/DropTargetTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.drl?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.drl Fri Jan 12 09:34:02
2007
@@ -28,7 +28,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.ibm?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86.ibm Fri Jan 12 09:34:02
2007
@@ -28,7 +28,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.drl?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.drl Fri Jan 12 09:34:02
2007
@@ -28,7 +28,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.ibm?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.ibm Fri Jan 12 09:34:02
2007
@@ -28,7 +28,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl Fri Jan 12 09:34:02
2007
@@ -27,7 +27,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm Fri Jan 12 09:34:02
2007
@@ -33,7 +33,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl Fri Jan 12
09:34:02 2007
@@ -27,7 +27,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm Fri Jan 12
09:34:02 2007
@@ -27,7 +27,6 @@
 java/awt/TextAreaTest.java
 java/awt/TextComponentTest.java
 java/awt/TextFieldTest.java
-java/awt/dnd/DropTargetTest.java
 java/awt/event/ContainerEventTest.java
 java/awt/WinWindowRTest.java
 org/apache/harmony/awt/gl/render/JavaBlitterTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTarget.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTarget.java?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTarget.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTarget.java
Fri Jan 12 09:34:02 2007
@@ -118,6 +118,10 @@
     }
 
     public void addNotify(ComponentPeer peer) {
+        if(component == null) {
+            return;
+        }
+        
         DTK dtk = DTK.getDTK();
         DropTargetContextPeer dtp = dtk.createDropTargetContextPeer(context);
         context.addNotify(dtp);

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/dnd/DropTargetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/dnd/DropTargetTest.java?view=diff&rev=495654&r1=495653&r2=495654
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/dnd/DropTargetTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/dnd/DropTargetTest.java
Fri Jan 12 09:34:02 2007
@@ -164,6 +164,8 @@
     }
     
     public void testAddNotify() {
+        // Regression for HARMONY-2492
+        new DropTarget().addNotify(null);
     }
 
     public void testAddRemoveNotify() {



Mime
View raw message