From 9aed179e4d4dfaa123b436fe017293ccd9a846ad Mon Sep 17 00:00:00 2001 From: Britt Park Date: Tue, 15 Aug 2006 23:25:40 +0000 Subject: [PATCH] This gets virtualization partially working using the AVM remote interface. Courtesy of Jon and Britt. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/avm/AVMRemoteImpl.java | 5 ++-- .../org/alfresco/repo/avm/AVMTestRemote.java | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java b/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java index 7de0a0243b..e6bf2fc4bc 100644 --- a/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java +++ b/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java @@ -20,7 +20,6 @@ package org.alfresco.repo.avm; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -148,6 +147,7 @@ public class AVMRemoteImpl implements AVMRemote, Runnable { // Do nothing. } + /* long now = System.currentTimeMillis(); List toClose = new ArrayList(); for (String handle : fInputLastAccessTimes.keySet()) @@ -201,6 +201,7 @@ public class AVMRemoteImpl implements AVMRemote, Runnable fOutputLastAccessTimes.remove(handle); fOutputBusy.remove(handle); } + */ } } @@ -268,7 +269,7 @@ public class AVMRemoteImpl implements AVMRemote, Runnable try { int read; - while ((read = in.read(buff, off, count - off)) != -1) + while ((read = in.read(buff, off, count - off)) != -1 && read != 0) { off += read; } diff --git a/source/java/org/alfresco/repo/avm/AVMTestRemote.java b/source/java/org/alfresco/repo/avm/AVMTestRemote.java index d029f059f2..47f1c1562d 100644 --- a/source/java/org/alfresco/repo/avm/AVMTestRemote.java +++ b/source/java/org/alfresco/repo/avm/AVMTestRemote.java @@ -103,4 +103,28 @@ public class AVMTestRemote extends TestCase fail(); } } + + /** + * Test a call that should throw an exception. + */ + public void testErrorState() + { + try + { + try + { + fAVMRemote.lookup(-1, "main:/fizz/fazz"); + fail(); + } + catch (AVMException e) + { + e.printStackTrace(System.out); + } + } + catch (Exception e) + { + e.printStackTrace(System.err); + fail(); + } + } }