Fixes for compiler warnings

3 files changed, 10 insertions, 11 deletions

diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
index a727df7b4..3fa25e205 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
@@ -64,9 +64,8 @@ public class GUID extends StringID {
 			throws IDInstantiationException {
 		super(n, "");
 		// Get SecureRandom instance for class
-		SecureRandom r = null;
 		try {
-			r = getRandom(algo, provider);
+			getRandom(algo, provider);
 		} catch (Exception e) {
 			throw new IDInstantiationException("GUID creation failure: "
 					+ e.getMessage());
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java
index 855ecef98..647af4fe7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java
@@ -40,10 +40,10 @@ public class NamespacePermission extends BasicPermission {
         if ((p == null) || (p.getClass() != getClass()))
             return false;
         NamespacePermission np = (NamespacePermission) p;
-        String actions = getActions();
-        if (actions == null)
+        String act = getActions();
+        if (act == null)
             return false;
-        if (actions.equals(ALL_NAMESPACE) || actions.equals(np.getActions()))
+        if (act.equals(ALL_NAMESPACE) || act.equals(np.getActions()))
             return true;
         return false;
     }
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
index 19a09c190..ae9f1fec7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
@@ -68,7 +68,7 @@ public class ECFPlugin extends Plugin {
     private static ECFPlugin plugin;
     // Resource bundle.
     private ResourceBundle resourceBundle;
-    BundleContext context = null;
+    BundleContext bundlecontext = null;
 
     private static void debug(String msg) {
         if (Trace.ON && trace != null) {
@@ -191,7 +191,6 @@ public class ECFPlugin extends Plugin {
                 // The only required attribute is "class"
                 exten = member
                         .createExecutableExtension(CONTAINER_FACTORY_EPOINT_CLASS_ATTRIBUTE);
-                ClassLoader cl = exten.getClass().getClassLoader();
                 String clazz = exten.getClass().getName();
                 // Get name and get version, if available
                 name = member
@@ -338,7 +337,6 @@ public class ECFPlugin extends Plugin {
                         .createExecutableExtension(COMM_FACTORY_EPOINT_CLASS_ATTRIBUTE);
                 // Verify that object implements
                 // ISynchAsynchConnectionInstantiator
-                ClassLoader cl = exten.getClass().getClassLoader();
                 String clazz = exten.getClass().getName();
                 // Get name and get version, if available
                 name = member.getAttribute(COMM_FACTORY_EPOINT_NAME_ATTRIBUTE);
@@ -362,6 +360,7 @@ public class ECFPlugin extends Plugin {
                 if (ConnectionFactory.containsDescription(cd)) {
                     // It's already there...log and throw as we can't use the
                     // same named factory
+                	
                     IStatus s = new Status(
                             Status.ERROR,
                             bundleName,
@@ -372,6 +371,7 @@ public class ECFPlugin extends Plugin {
                                     + extension
                                             .getExtensionPointUniqueIdentifier(),
                             null);
+                    log(s);
                     throw new CoreException(getStatusForCommException(
                             extension, bundleName, name));
                 }
@@ -436,7 +436,7 @@ public class ECFPlugin extends Plugin {
         setupContainerExtensionPoint(context);
         setupIdentityExtensionPoint(context);
         setupCommExtensionPoint(context);
-        this.context = context;
+        this.bundlecontext = context;
     }
 
     /**
@@ -444,11 +444,11 @@ public class ECFPlugin extends Plugin {
      */
     public void stop(BundleContext context) throws Exception {
         super.stop(context);
-        this.context = null;
+        this.bundlecontext = null;
     }
 
     public BundleContext getBundleContext() {
-        return context;
+        return bundlecontext;
     }
 
     /**