You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2009/06/20 22:58:58 UTC
svn commit: r786907 -
/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/
Author: mcombellack
Date: Sat Jun 20 20:58:58 2009
New Revision: 786907
URL: http://svn.apache.org/viewvc?rev=786907&view=rev
Log:
Issue: NullPointerException will be thrown in the destory methods if the domains fail to initialise because the destroy method attempts to close the domain but the domain is null.
Fix: Added check for null before attempting to close the domain
Modified:
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java Sat Jun 20 20:58:58 2009
@@ -49,8 +49,12 @@
@AfterClass
public static void destroy() throws Exception {
// System.out.println(">>>AtomDeleteTestCase.destroy entry");
- scaConsumerDomain.close();
- scaProviderDomain.close();
+ if (scaConsumerDomain != null) {
+ scaConsumerDomain.close();
+ }
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
}
@Test
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java Sat Jun 20 20:58:58 2009
@@ -47,8 +47,12 @@
@AfterClass
public static void destroy() throws Exception {
// System.out.println(">>>AtomGetTestCase.destroy entry");
- scaConsumerDomain.close();
- scaProviderDomain.close();
+ if (scaConsumerDomain != null) {
+ scaConsumerDomain.close();
+ }
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
}
@Test
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java Sat Jun 20 20:58:58 2009
@@ -47,8 +47,12 @@
@AfterClass
public static void destroy() throws Exception {
System.out.println(">>>AtomPostTestCase.destroy entry");
- scaConsumerDomain.close();
- scaProviderDomain.close();
+ if (scaConsumerDomain != null) {
+ scaConsumerDomain.close();
+ }
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
}
@Test
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java Sat Jun 20 20:58:58 2009
@@ -49,8 +49,12 @@
@AfterClass
public static void destroy() throws Exception {
// System.out.println(">>>AtomPutTestCase.destroy entry");
- scaConsumerDomain.close();
- scaProviderDomain.close();
+ if (scaConsumerDomain != null) {
+ scaConsumerDomain.close();
+ }
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
}
@Test
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java Sat Jun 20 20:58:58 2009
@@ -51,7 +51,6 @@
*/
public class MediaCollectionTestCase {
public final static String providerURI = "http://localhost:8084/receipt";
- protected static SCADomain scaConsumerDomain;
protected static SCADomain scaProviderDomain;
protected static CustomerClient testService;
protected static Abdera abdera;
@@ -71,11 +70,13 @@
abderaParser = Abdera.getNewParser();
}
- @AfterClass
- public static void destroy() throws Exception {
- System.out.println(">>>MediaCollectionTestCase.destroy");
- scaProviderDomain.close();
- }
+ @AfterClass
+ public static void destroy() throws Exception {
+ System.out.println(">>>MediaCollectionTestCase.destroy");
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
+ }
@Test
public void testPrelim() throws Exception {
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java Sat Jun 20 20:58:58 2009
@@ -47,7 +47,6 @@
*/
public class ProviderEntryEntityTagsTestCase {
public final static String providerURI = "http://localhost:8084/customer";
- protected static SCADomain scaConsumerDomain;
protected static SCADomain scaProviderDomain;
protected static CustomerClient testService;
protected static Abdera abdera;
@@ -66,11 +65,13 @@
abderaParser = Abdera.getNewParser();
}
- @AfterClass
- public static void destroy() throws Exception {
- System.out.println(">>>ProviderEntryEntityTagsTestCase.destroy");
- scaProviderDomain.close();
- }
+ @AfterClass
+ public static void destroy() throws Exception {
+ System.out.println(">>>ProviderEntryEntityTagsTestCase.destroy");
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
+ }
@Test
public void testPrelim() throws Exception {
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java Sat Jun 20 20:58:58 2009
@@ -53,7 +53,6 @@
*/
public class ProviderFeedEntityTagsTestCase {
public final static String providerURI = "http://localhost:8084/customer";
- protected static SCADomain scaConsumerDomain;
protected static SCADomain scaProviderDomain;
protected static CustomerClient testService;
protected static Abdera abdera;
@@ -72,11 +71,13 @@
abderaParser = Abdera.getNewParser();
}
- @AfterClass
- public static void destroy() throws Exception {
- System.out.println(">>>ProviderFeedEntityTagsTestCase.destroy");
- scaProviderDomain.close();
- }
+ @AfterClass
+ public static void destroy() throws Exception {
+ System.out.println(">>>ProviderFeedEntityTagsTestCase.destroy");
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
+ }
@Test
public void testPrelim() throws Exception {
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java?rev=786907&r1=786906&r2=786907&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java Sat Jun 20 20:58:58 2009
@@ -65,10 +65,12 @@
abderaParser = Abdera.getNewParser();
}
- @AfterClass
- public static void destroy() throws Exception {
- scaProviderDomain.close();
- }
+ @AfterClass
+ public static void destroy() throws Exception {
+ if (scaProviderDomain != null) {
+ scaProviderDomain.close();
+ }
+ }
@Test
public void testPrelim() throws Exception {