From 551bb74712135d04b8e31bdbbd5ae83b3682b5e7 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Fri, 29 Jul 2022 14:58:03 +0200
Subject: [PATCH] revert pac ip update code

---
 hsarback/src/de/hsadmin/mods/pac/Pac.java           |  3 +--
 hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java | 10 ----------
 hsarback/src/de/hsadmin/remote/PacRemote.java       |  5 -----
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/pac/Pac.java b/hsarback/src/de/hsadmin/mods/pac/Pac.java
index 8e44c15..84d3935 100644
--- a/hsarback/src/de/hsadmin/mods/pac/Pac.java
+++ b/hsarback/src/de/hsadmin/mods/pac/Pac.java
@@ -10,7 +10,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -78,7 +77,7 @@ public class Pac extends AbstractEntity implements Serializable {
 	private boolean free = false;
 	
 	@JoinColumn(name = "cur_inet_addr_id", nullable = true)
-	@ManyToOne(fetch = EAGER, cascade = CascadeType.MERGE)
+	@ManyToOne(fetch = EAGER)
 	@AnnFieldIO(rw=ReadWriteAccess.WRITEONCE,validation="[0-9\\.]*",overwriteName="curinetaddr")
 	private INetAddress curINetAddr;
 
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java b/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
index 9e0b854..98fecc4 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
@@ -130,16 +130,6 @@ public class PacModuleImpl extends AbstractModuleImpl {
 		Pac newState = (Pac) entity;
 		EntityManager em = getTransaction().getEntityManager();
 		Pac oldState = em.find(Pac.class, newState.getId());
-
-		String oldCurINetAddr = oldState.getCurINetAddr().getInet4Addr();
-		String newCurINetAddr = newState.getCurINetAddr().getInet4Addr();
-		
-		System.out.println("new IP: " + newCurINetAddr);
-		System.out.println("old IP: " + oldCurINetAddr);
-		if (newCurINetAddr != null && !newCurINetAddr.isEmpty() && !newCurINetAddr.equals(oldCurINetAddr)) {
-			System.out.println("needs IP update");
-		}
-		
 		String oldBasepacName = oldState.getBasepac().getName();
 		BasePac newBasepac = newState.getBasepac();
 		String newBasepacName = newBasepac.getName();
diff --git a/hsarback/src/de/hsadmin/remote/PacRemote.java b/hsarback/src/de/hsadmin/remote/PacRemote.java
index 9d3fb49..8aacf39 100644
--- a/hsarback/src/de/hsadmin/remote/PacRemote.java
+++ b/hsarback/src/de/hsadmin/remote/PacRemote.java
@@ -80,11 +80,6 @@ public class PacRemote extends AbstractRemote {
 			curINetAddr = new INetAddress(inetAddrString);
 			pac.setCurINetAddr(curINetAddr);
 		}
-		if (curINetAddr != null && curINetAddr.getInet4Addr() != null && assertNotNull(inetAddrString) && !curINetAddr.getInet4Addr().equals(inetAddrString)) {
-			System.out.println("IP Update: " + inetAddrString);
-			curINetAddr = new INetAddress(inetAddrString);
-			pac.setCurINetAddr(curINetAddr);
-		}
 		Customer customer = pac.getCustomer();
 		String memberCode = (String) setParams.get("customer");
 		if (customer == null && assertNotNull(memberCode)) {