Eliminate unnecessary merge()

quaff · quaff · commit 372f10c18d5e · 2024-03-19T10:03:59.000+08:00
Fix spring-projectsGH-3401
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -195,7 +195,7 @@ public void delete(T entity) {
 			return;
 		}
 
-		entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity));
+		entityManager.remove(existing);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public void delete(T entity) {`
`195`	`195`	`return;`
`196`	`196`	`}`
`197`	`197`
`198`		`- entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity));`
	`198`	`+ entityManager.remove(existing);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`@Override`