]> git.mxchange.org Git - jphone-core.git/commitdiff
Only merge
authorRoland Haeder <roland@mxchange.org>
Fri, 23 Oct 2015 15:57:44 +0000 (17:57 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 23 Oct 2015 15:57:44 +0000 (17:57 +0200)
src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java

index 158c39f255b27f9afa5835d878642e2c7b3dd3a5..9b2f99e7846b7a209c67c6e73a08da9239157790 100644 (file)
@@ -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;
 
        /**
index 4724ceda1f7d6af9cde92002dab11b37e2edc001..80c16c9b0e2ba5092e56ca0a7c60195fe72cf4ae 100644 (file)
@@ -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;
 
        /**