From 3942ed513b2f614f89c7090be4dfbd09ded40712 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 23 Oct 2015 17:57:44 +0200
Subject: [PATCH] Only merge

---
 .../mxchange/jphone/phonenumbers/landline/LandLineNumber.java   | 2 +-
 .../jphone/phonenumbers/smsprovider/CellphoneProvider.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index 158c39f..9b2f99e 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -82,7 +82,7 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	 * Connection to table "country_data"
 	 */
 	@JoinColumn (name = "phone_country_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
 	private Country phoneCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
index 4724ced..80c16c9 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
@@ -79,7 +79,7 @@ public class CellphoneProvider implements SmsProvider, Comparable<SmsProvider> {
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "provider_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
 	private Country providerCountry;
 
 	/**
-- 
2.39.5