Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #1940 #1942

Merged
merged 1 commit into from
Jan 25, 2013
Merged

fixes #1940 #1942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand Down Expand Up @@ -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);
Expand Down