Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2015-04-15 14:32:21 +0000
committerFlorian Waibel2015-04-15 14:32:21 +0000
commit3f5dbcc4b58e78877466814f98ece4dc5d00c6e2 (patch)
tree01727c83215355e3e5cd903a90278e1147084c9d
parente138363f1997b52e3990c2313bc53c76690eed86 (diff)
downloadorg.eclipse.virgo.kernel-3f5dbcc4b58e78877466814f98ece4dc5d00c6e2.tar.gz
org.eclipse.virgo.kernel-3f5dbcc4b58e78877466814f98ece4dc5d00c6e2.tar.xz
org.eclipse.virgo.kernel-3f5dbcc4b58e78877466814f98ece4dc5d00c6e2.zip
Replaces '_' as an identifier, since it is a reserved keyword from source level 1.8 on
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/main/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSEntry.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStore.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactRefreshHandler.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/BundleThreadContextManager.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java2
-rw-r--r--org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/BundleFileClosingBundleFileWrapperFactoryHook.java2
-rw-r--r--org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/ExtendedBundleFileWrapperFactoryHook.java2
-rw-r--r--org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/MetaInfResourceClassLoaderDelegateHook.java6
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfigurationArtifact.java2
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerConfigArtifact.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/KernelBundleClassLoader.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/UsesAnalyserTests.java2
12 files changed, 16 insertions, 16 deletions
diff --git a/org.eclipse.virgo.kernel.artifact/src/main/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSEntry.java b/org.eclipse.virgo.kernel.artifact/src/main/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSEntry.java
index 215f5253..5f4866d2 100644
--- a/org.eclipse.virgo.kernel.artifact/src/main/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSEntry.java
+++ b/org.eclipse.virgo.kernel.artifact/src/main/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSEntry.java
@@ -241,7 +241,7 @@ final class JarFileArtifactFSEntry implements ArtifactFSEntry {
InputStream is = null;
try {
is = new BufferedInputStream(new FileInputStream(file));
- } catch (FileNotFoundException _) {
+ } catch (FileNotFoundException ignored) {
}
this.zipInputStream = is == null ? null : new ZipInputStream(is);
}
@@ -250,7 +250,7 @@ final class JarFileArtifactFSEntry implements ArtifactFSEntry {
if (this.zipInputStream != null) {
try {
return this.zipInputStream.getNextEntry();
- } catch (IOException _) {
+ } catch (IOException ignored) {
}
}
return null;
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStore.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStore.java
index a012bd84..ae34664a 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStore.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStore.java
@@ -63,7 +63,7 @@ final class GenerationalArtifactStore extends AbstractArtifactStore implements A
if (childGeneration > lastGeneration) {
lastGeneration = childGeneration;
}
- } catch (NumberFormatException _) {
+ } catch (NumberFormatException ignored) {
}
}
}
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactRefreshHandler.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactRefreshHandler.java
index 4aeba7c2..6e39d067 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactRefreshHandler.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactRefreshHandler.java
@@ -50,9 +50,9 @@ final class StandardInstallArtifactRefreshHandler implements InstallArtifactRefr
InstallEnvironment installEnvironment = this.installEnvironmentFactory.createInstallEnvironment(installArtifact);
try {
this.refreshPipeline.process(graph, installEnvironment);
- } catch (UnableToSatisfyBundleDependenciesException _) {
+ } catch (UnableToSatisfyBundleDependenciesException utsbde) {
refreshed = false;
- } catch (DeploymentException _) {
+ } catch (DeploymentException de) {
refreshed = false;
} finally {
installEnvironment.destroy();
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/BundleThreadContextManager.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/BundleThreadContextManager.java
index 4d61e1fa..343e79fc 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/BundleThreadContextManager.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/BundleThreadContextManager.java
@@ -117,7 +117,7 @@ final class BundleThreadContextManager {
ClassLoader newContextClassLoader = null;
try {
newContextClassLoader = this.osgi.getBundleClassLoader(this.threadContextBundle);
- } catch (BundleClassLoaderUnavailableException _) {
+ } catch (BundleClassLoaderUnavailableException bclue) {
this.logger.info("Bundle class loader not available, it may not be resolved");
}
if (newContextClassLoader != null) {
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java
index 8058924e..d9d4b14d 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java
@@ -384,7 +384,7 @@ final class StandardBundleInstallArtifact extends AbstractInstallArtifact implem
}
}
return refreshed;
- } catch (Exception _) {
+ } catch (Exception e) {
return false;
}
}
diff --git a/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/BundleFileClosingBundleFileWrapperFactoryHook.java b/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/BundleFileClosingBundleFileWrapperFactoryHook.java
index 00ec7368..0b0626d2 100644
--- a/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/BundleFileClosingBundleFileWrapperFactoryHook.java
+++ b/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/BundleFileClosingBundleFileWrapperFactoryHook.java
@@ -65,7 +65,7 @@ public final class BundleFileClosingBundleFileWrapperFactoryHook implements Bund
for (BundleFile bundleFile : localBundleFiles) {
try {
bundleFile.close();
- } catch (IOException _) {
+ } catch (IOException ignored) {
}
}
}
diff --git a/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/ExtendedBundleFileWrapperFactoryHook.java b/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/ExtendedBundleFileWrapperFactoryHook.java
index 501d369a..ca5c798b 100644
--- a/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/ExtendedBundleFileWrapperFactoryHook.java
+++ b/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/ExtendedBundleFileWrapperFactoryHook.java
@@ -191,7 +191,7 @@ final class ExtendedBundleFileWrapperFactoryHook implements BundleFileWrapperFac
if (jarFile != null) {
try {
jarFile.close();
- } catch (IOException _) {
+ } catch (IOException ignored) {
}
}
}
diff --git a/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/MetaInfResourceClassLoaderDelegateHook.java b/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/MetaInfResourceClassLoaderDelegateHook.java
index 3fa74bd0..f7d5d0f7 100644
--- a/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/MetaInfResourceClassLoaderDelegateHook.java
+++ b/org.eclipse.virgo.kernel.equinox.extensions/src/main/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/MetaInfResourceClassLoaderDelegateHook.java
@@ -121,7 +121,7 @@ public class MetaInfResourceClassLoaderDelegateHook implements ClassLoaderDelega
} else {
removeDependency(classLoader.getBundle(), dependency);
}
- } catch (IllegalStateException _) {
+ } catch (IllegalStateException ise) {
// Dependency now UNINSTALLED
removeDependency(classLoader.getBundle(), dependency);
}
@@ -152,8 +152,8 @@ public class MetaInfResourceClassLoaderDelegateHook implements ClassLoaderDelega
} else {
removeDependency(classLoader.getBundle(), dependency);
}
- } catch (IOException _) {
- } catch (IllegalStateException _) {
+ } catch (IOException ignored) {
+ } catch (IllegalStateException ise) {
// Dependency now UNINSTALLED
removeDependency(classLoader.getBundle(), dependency);
}
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfigurationArtifact.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfigurationArtifact.java
index 666508f9..1d612c44 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfigurationArtifact.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfigurationArtifact.java
@@ -77,7 +77,7 @@ final class ConfigurationArtifact extends AbstractArtifact {
if(bundleLocation != null){
properties.put("Bound to Bundle", bundleLocation);
}
- } catch (IOException _) {
+ } catch (IOException ignored) {
// Default to superclass behaviour
} catch (IllegalStateException e){
properties.put("ERROR", "Configuration has been deleted");
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerConfigArtifact.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerConfigArtifact.java
index 67794b41..fbccfa58 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerConfigArtifact.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerConfigArtifact.java
@@ -57,7 +57,7 @@ final class DeployerConfigArtifact extends DeployerArtifact {
}
}
}
- } catch (IOException _) {
+ } catch (IOException ignored) {
// Default to superclass behaviour
}
return properties;
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/KernelBundleClassLoader.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/KernelBundleClassLoader.java
index c1e660a1..133ad2c6 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/KernelBundleClassLoader.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/KernelBundleClassLoader.java
@@ -301,7 +301,7 @@ public final class KernelBundleClassLoader extends DefaultClassLoader implements
readDriversField.setAccessible(true);
readDriversField.set(null, readDrivers);
LOGGER.debug("Cleared JDBC drivers for " + this + " using Java 6 strategy");
- } catch (Exception _) {
+ } catch (Exception javaSixWayFailed) {
try { // Java 7
Field registeredDriversField = DriverManager.class.getDeclaredField("registeredDrivers");
registeredDriversField.setAccessible(true);
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/UsesAnalyserTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/UsesAnalyserTests.java
index 84701566..047ae0eb 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/UsesAnalyserTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/UsesAnalyserTests.java
@@ -119,7 +119,7 @@ public class UsesAnalyserTests extends AbstractOsgiFrameworkLaunchingTests {
Bundle a = install("transitiveconstraint/tmA.jar");
try {
a.start();
- } catch (BundleException _) {
+ } catch (BundleException ignored) {
}
State systemState = ((StateManager) this.platformAdmin).getSystemState();

Back to the top