sijie closed pull request #1227: Fix AbstractLedgerManagerFactory on handling
both shaded class and original class co-exists case
URL: https://github.com/apache/bookkeeper/pull/1227
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
index 4fa2546be..5600dfac3 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
@@ -199,11 +199,11 @@ public static LedgerManagerFactory
newLedgerManagerFactory(
throw new IOException("Wrong ledger manager factory " +
layout.getManagerFactoryClass());
}
factoryClass = theCls.asSubclass(LedgerManagerFactory.class);
- } catch (ClassNotFoundException cnfe) {
+ } catch (ClassNotFoundException | IOException e) {
factoryClass = attemptToResolveShadedLedgerManagerFactory(
conf,
layout.getManagerFactoryClass(),
- cnfe);
+ e);
}
}
// instantiate a factory
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
