inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
40292: FRENCH: Translation update based on EN 40202
   40293: ITALIAN: Translation update based on EN 40202
   40295: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40294: ALF-9540: Fix potential NPE
   40296: Merged V4.1 to V4.1-BUG-FIX
      40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted)
      - fixed as per PM expected behaviour + unit tests
      40176: CloudSync: add simple rename test (file + folder sync)
      40182: ALF-15424: Merged PATCHES/V4.0.2 to V4.1
         40181: Merged PATCHES/V4.0.1 to PATCHES/V4.0.2    
            40180: ALF15009: QNames that do not exist yet cause a "java.sql.SQLException: Invalid column type"       
               - getQNameId will now return a -1 instead of null. This will allow the SQL to execute and return no rows.
      40276: ALF-15472: Updates help links to 4.1 & also fixes ALF-11929 - the video tutorial link now points to a video tutorial.
      40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" !
      - fix the RemoteAlfrescoTicketService (to set the remote system request headers)
      40285: ALF-15474: alfresco-opencmis-extension jar is missing from the share war (error in build.properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-10 11:20:15 +00:00
parent cb963a6def
commit 8f4b647417
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
View File

@@ -140,7 +140,7 @@ public abstract class AbstractQNameAwareCannedQueryFactory<R> extends AbstractCa
{
logger.trace("QName does not exist: " + qname); // possible ... eg. blg:blogPost if a blog has never been posted externally
}
return null;
return -1L;
}
return qnamePair.getFirst();
}

11
source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
View File

@@ -326,7 +326,16 @@ public class RemoteAlfrescoTicketServiceImpl implements RemoteAlfrescoTicketServ
// Turn this into a remote request
RemoteConnectorRequest request = remoteConnectorService.buildRequest(url, "POST");
request.setRequestBody(json.toJSONString());
Map<String,String> reqHeaders = remoteSystemsReqHeaders.get(remoteSystemId);
if (reqHeaders != null)
{
for (Map.Entry<String, String> reqHeader : reqHeaders.entrySet())
{
request.addRequestHeader(reqHeader.getKey(), reqHeader.getValue());
}
}
// Work out what key we'll use to cache on
String cacheKey = toCacheKey(remoteSystemId, credentials);

5
source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
View File

@@ -709,7 +709,10 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
public void onUpdateUserProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
{
String uidBefore = DefaultTypeConverter.INSTANCE.convert(String.class, before.get(ContentModel.PROP_USER_USERNAME));
authenticationCache.remove(uidBefore);
if (uidBefore != null)
{
authenticationCache.remove(uidBefore);
}
}
@Override