Bug 302011 - Should provide causing exception where possible

2 files changed, 6 insertions, 6 deletions

diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
index 871132649..a4d3d18ec 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
@@ -385,9 +385,9 @@ class StateBuilder {
 					} catch (ClassNotFoundException e) {
 						// oh well cannot support; just use string
 						putValue = value;
-					} catch (Exception e) { // got some reflection exception
-						if (e instanceof RuntimeException)
-							throw (RuntimeException) e;
+					} catch (RuntimeException e) { // got some reflection exception
+						throw e;
+					} catch (Exception e) {
 						throw new RuntimeException(e.getMessage(), e);
 					}
 				else if (ATTR_TYPE_VERSION.equals(type))
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateReader.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateReader.java
index 148063b65..c27993808 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateReader.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateReader.java
@@ -418,9 +418,9 @@ final class StateReader {
 					value = constructor.newInstance(new Object[] {value});
 				} catch (ClassNotFoundException e) {
 					// oh well cannot support; just use the string
-				} catch (Exception e) { // got some reflection exception
-					if (e instanceof RuntimeException)
-						throw (RuntimeException) e;
+				} catch (RuntimeException e) { // got some reflection exception
+					throw e;
+				} catch (Exception e) {
 					throw new RuntimeException(e.getMessage(), e);
 				}
 			}