Repository: incubator-geode Updated Branches: refs/heads/develop 442718f45 -> bec420bf5
GEODE-1103 intermittent suspect string in server cache during shutdown Added an exception handler for InterruptedException that checks to see if the AcceptorImpl is shutting down. If so a warning message about the interrupt is not logged. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bec420bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bec420bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bec420bf Branch: refs/heads/develop Commit: bec420bf54d7c78a8a81264f41b578f529453327 Parents: 442718f Author: Bruce Schuchardt <[email protected]> Authored: Wed Mar 16 16:02:30 2016 -0700 Committer: Bruce Schuchardt <[email protected]> Committed: Wed Mar 16 16:02:30 2016 -0700 ---------------------------------------------------------------------- .../gemfire/internal/cache/tier/sockets/AcceptorImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bec420bf/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java index 89c073f..9f18f50 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java @@ -1682,12 +1682,13 @@ public class AcceptorImpl extends Acceptor implements Runnable } } // synchronized - } - catch (Exception e) {/* ignore */ + } catch (InterruptedException e) { + if (!this.shutdown) { // GEODE-1103: expect an interrupt during shutdown + logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_UNEXPECTED), e); + } + } catch (Exception e) {/* ignore */ logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_UNEXPECTED), e); } - finally{ - } } private void shutdownSCs() {
