From 969ccb7b24b99cecf165f150855b65c4176abcfc Mon Sep 17 00:00:00 2001 From: Daniel Silva Date: Fri, 25 Jan 2013 16:35:50 -0430 Subject: [PATCH] fixes #1940 --- .../elasticsearch/business/ESContentletAPIImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/src/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java index fdd4a4d8a2d3..6e4eac252af0 100644 --- a/src/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java +++ b/src/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java @@ -2080,6 +2080,10 @@ private Contentlet checkin(Contentlet contentlet, ContentletRelationships conten String contentPushExpireTime = contentlet.getStringProperty("wfExpireTime"); String contentPushNeverExpire = contentlet.getStringProperty("wfNeverExpire"); + if(saveWithExistingID) + contentlet = conFac.save(contentlet, existingInode); + else + contentlet = conFac.save(contentlet); if (!InodeUtils.isSet(contentlet.getIdentifier())) { Treeable parent = null; @@ -2095,7 +2099,7 @@ private Contentlet checkin(Contentlet contentlet, ContentletRelationships conten else ident = APILocator.getIdentifierAPI().createNew(contPar, parent); contentlet.setIdentifier(ident.getId()); - //contentlet = conFac.save(contentlet); + contentlet = conFac.save(contentlet); } else { Identifier ident = APILocator.getIdentifierAPI().find(contentlet); @@ -2123,10 +2127,7 @@ private Contentlet checkin(Contentlet contentlet, ContentletRelationships conten APILocator.getIdentifierAPI().save(ident); } - if(saveWithExistingID) - contentlet = conFac.save(contentlet, existingInode); - else - contentlet = conFac.save(contentlet); + APILocator.getVersionableAPI().setWorking(contentlet);