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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68549: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68315: MNT-11348 Try to fix build error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 17:20:39 +00:00
parent be8d2994ea
commit da7fdf7b10
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
View File

@@ -1327,7 +1327,8 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
{ {
String snapshot = createSnapshot(nodesA1, "repo A"); String snapshot = createSnapshot(nodesA1, "repo A");
log.debug(snapshot); log.debug(snapshot);
receiver.saveSnapshot(transferIdA1, new StringInputStream(snapshot, "UTF-8"));
receiver.saveSnapshot(transferIdA1, new ByteArrayInputStream(snapshot.getBytes("UTF-8")));
for (TransferManifestNode node : nodesA1) for (TransferManifestNode node : nodesA1)
{ {
@@ -1369,7 +1370,7 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
{ {
String snapshot = createSnapshot(nodesB1, "repo B"); String snapshot = createSnapshot(nodesB1, "repo B");
log.debug(snapshot); log.debug(snapshot);
receiver.saveSnapshot(transferIdB1, new StringInputStream(snapshot, "UTF-8")); receiver.saveSnapshot(transferIdB1, new ByteArrayInputStream(snapshot.getBytes("UTF-8")));
for (TransferManifestNode node : nodesB1) for (TransferManifestNode node : nodesB1)
{ {
@@ -1418,7 +1419,7 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
String transferId = receiver.start("transferFromRepoA1Again", true, receiver.getVersion()); String transferId = receiver.start("transferFromRepoA1Again", true, receiver.getVersion());
String snapshot = createSnapshot(nodesA1, "repo A"); String snapshot = createSnapshot(nodesA1, "repo A");
log.debug(snapshot); log.debug(snapshot);
receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8")); receiver.saveSnapshot(transferId, new ByteArrayInputStream(snapshot.getBytes("UTF-8")));
receiver.commit(transferId); receiver.commit(transferId);
} }
catch(Exception ex) catch(Exception ex)