<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -197,11 +197,15 @@ public class FlexRemotingAMFFactory implements GlueableService, Activatable,
 	}
 
 	private void cleanup() {
-		amfServicesTracker.close();
-		amfServicesTracker = null;
+		if (null != amfServicesTracker) {
+			amfServicesTracker.close();
+			amfServicesTracker = null;
+		}
 
-		config.dispose();
-		config = null;
+		if (null != config) {
+			config.dispose();
+			config = null;
+		}
 	}
 
 	@SuppressWarnings(&quot;unchecked&quot;)</diff>
      <filename>uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/FlexRemotingAMFFactory.java</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>08d423c5fb1a4bc28cd577cd1e9200158f1c9506</id>
    </parent>
  </parents>
  <author>
    <name>brindy</name>
    <email>brindy@brindy.org.uk</email>
  </author>
  <url>http://github.com/arum/bundles/commit/ef271ae85bd859af2243b1c353c6a44fdd3c5ac2</url>
  <id>ef271ae85bd859af2243b1c353c6a44fdd3c5ac2</id>
  <committed-date>2009-11-01T14:48:10-08:00</committed-date>
  <authored-date>2009-11-01T14:48:10-08:00</authored-date>
  <message>null checking in cleanup method</message>
  <tree>3386c1135227ee5759f776f3394abb058507e10c</tree>
  <committer>
    <name>brindy</name>
    <email>brindy@brindy.org.uk</email>
  </committer>
</commit>
