diff options
Diffstat (limited to 'plugins')
2 files changed, 4 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java index 98500b3898..ff131ab176 100644 --- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java +++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -979,5 +979,4 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter }; } } - } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java index e3cbf56972..e6fedad034 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java @@ -51,14 +51,11 @@ public class SmartPreparedStatementCache extends AbstractPreparedStatementCache public void releasePreparedStatement(PreparedStatement ps) { - if (ps == null) + if (ps != null) // Bug 276926: Silently accept ps == null and do nothing. { - // Bug 276926 - // silently accept ps == null and do nothing. - return; + CachedPreparedStatement cachedStatement = checkedOut.remove(ps); + cache.put(cachedStatement); } - CachedPreparedStatement cachedStatement = checkedOut.remove(ps); - cache.put(cachedStatement); } @Override |