Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/65264281 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/65264281 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/65264281 Branch: refs/heads/tomee-1.7.x Commit: 6526428118939ef12ad2a3e040076e0e2559b51c Parents: 5f087e9 Author: Jonathan Gallimore <[email protected]> Authored: Tue Feb 9 20:57:12 2016 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Tue Feb 9 20:57:12 2016 +0000 ---------------------------------------------------------------------- .../apache/openejb/assembler/classic/Assembler.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/65264281/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 7018222..6357d94 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -1700,10 +1700,10 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } else if (LazyResource.class.isInstance(object)) { removeResourceInfo(boundName); try { - containerSystem.getJNDIContext().unbind(boundName); - } catch (NamingException e) { - logger.error("Error unbinding " + boundName, e); - } + containerSystem.getJNDIContext().unbind(boundName); + } catch (NamingException e) { + logger.error("Error unbinding " + boundName, e); + } } else { resources.add(new DestroyingResource(binding.getName(), binding.getClassName(), object)); } @@ -2225,16 +2225,16 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A while (bindings.hasMoreElements()) { final Binding binding = bindings.nextElement(); if (!binding.getName().equals(objName)) { - continue; + continue; } if (!LazyObjectReference.class.isInstance(binding.getObject())) { - continue; + continue; } final LazyObjectReference<?> ref = LazyObjectReference.class.cast(binding.getObject()); if (! ref.isInitialized()) { - globalContext.unbind(name); + globalContext.unbind(name); removeResourceInfo(name); return; }
