made ResourceService.merge @transactional as two errors in the SOAPui

jateeter · jateeter · commit 2f3d9db548d1 · 2014-07-28T11:15:16.000-04:00
tests started showing up ???
diff --git a/src/main/java/org/energyos/espi/common/service/impl/ResourceServiceImpl.java b/src/main/java/org/energyos/espi/common/service/impl/ResourceServiceImpl.java
@@ -308,6 +308,7 @@ public <T extends IdentifiedObject> void deleteByXPathId(Long id1,
 		
 	}
 
+	@Transactional
 	@Override
 	public<T extends IdentifiedObject> T merge(IdentifiedObject resource) {
 		return repository.merge(resource);

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,7 @@ public <T extends IdentifiedObject> void deleteByXPathId(Long id1,`
`308`	`308`
`309`	`309`	`}`
`310`	`310`
	`311`	`+ @Transactional`
`311`	`312`	`@Override`
`312`	`313`	`public<T extends IdentifiedObject> T merge(IdentifiedObject resource) {`
`313`	`314`	`return repository.merge(resource);`