diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileBundle.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileBundle.java index 5c621ce93..9f6d6bf45 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileBundle.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileBundle.java @@ -64,11 +64,7 @@ public class PublicPersonalProfileBundle extends ContentBundle { collection.next(); dobj = collection.getDataObject(); collection.close(); - - final GenericPersonBundle bundle = - (GenericPersonBundle) DomainObjectFactory. - newInstance(dobj); - + return (GenericPersonBundle) DomainObjectFactory.newInstance(dobj); } } diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java index 507577e17..bcf95bec1 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java @@ -141,7 +141,8 @@ public class PublicPersonalProfileOwnerAssocUpgrade extends Program { profilesRs.getInt(1))); stmt.addBatch(String.format( "UPDATE acs_objects " - + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.PublicPersonalProfileBundle' " + + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.PublicPersonalProfileBundle', " + + "object_type = 'com.arsdigita.cms.contenttypes.PublicPersonalProfileBundle' " + "WHERE object_id = %d", profilesRs.getInt(1))); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java index d6987ff08..a20119d18 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java @@ -155,7 +155,8 @@ public class GenericContactPersonAssocUpgrade extends Program { personsRs.getInt(1))); stmt.addBatch(String.format( "UPDATE acs_objects " - + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.GenericPersonBundle' " + + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.GenericPersonBundle'," + + "object_type = 'com.arsdigita.cms.contenttypes.GenericPersonBundle' " + "WHERE object_id = %d", personsRs.getInt(1))); } @@ -172,7 +173,8 @@ public class GenericContactPersonAssocUpgrade extends Program { contactsRs.getInt(1))); stmt.addBatch(String.format( "UPDATE acs_objects " - + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.GenericContactBundle' " + + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.GenericContactBundle', " + + "object_type = 'com.arsdigita.cms.contenttypes.GenericContactBundle' " + "WHERE object_id = %d", contactsRs.getInt(1))); }