Repository: jclouds-labs Updated Branches: refs/heads/master e74eefcda -> 0e5e7faeb
Avoid unneeded queries in JDBC blobstore Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/0e5e7fae Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/0e5e7fae Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/0e5e7fae Branch: refs/heads/master Commit: 0e5e7faeb1d60a7e3dfcb72293a1319c436e38c3 Parents: e74eefc Author: Andrew Gaul <[email protected]> Authored: Thu Feb 25 21:20:31 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Thu Feb 25 21:20:31 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/jclouds/jdbc/repository/ContainerRepository.java | 2 +- .../main/java/org/jclouds/jdbc/repository/GenericRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0e5e7fae/jdbc/src/main/java/org/jclouds/jdbc/repository/ContainerRepository.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/repository/ContainerRepository.java b/jdbc/src/main/java/org/jclouds/jdbc/repository/ContainerRepository.java index fe68770..7894683 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/repository/ContainerRepository.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/repository/ContainerRepository.java @@ -51,7 +51,7 @@ public class ContainerRepository extends GenericRepository<ContainerEntity, Long public void deleteContainerByName(String name) { ContainerEntity containerEntity = findContainerByName(name); if (containerEntity != null) { - delete(findContainerByName(name)); + delete(containerEntity); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0e5e7fae/jdbc/src/main/java/org/jclouds/jdbc/repository/GenericRepository.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/repository/GenericRepository.java b/jdbc/src/main/java/org/jclouds/jdbc/repository/GenericRepository.java index 58964a8..fcb872e 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/repository/GenericRepository.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/repository/GenericRepository.java @@ -49,7 +49,7 @@ public abstract class GenericRepository<T, PK extends Serializable> { } public void delete(T entity) { - entityManager.get().remove(entityManager.get().contains(entity) ? entity : entityManager.get().merge(entity)); + entityManager.get().remove(entity); } }
