Uh... are you sure you merged the right change? This commit doesn't look anything like the message that describes it. And for that matter, what is "0 syntax"?
On Mon, Feb 9, 2009 at 9:05 PM, <[email protected]> wrote: > Author: byron > Date: Tue Feb 10 05:05:11 2009 > New Revision: 742852 > > URL: http://svn.apache.org/viewvc?rev=742852&view=rev > Log: > VELOCITY-688 Change so that 0 syntax causes the exception if the reference is > null instead of $, copy from trunk > > Modified: > velocity/engine/branches/2.0_Exp/experimental/benchmark/Benchmark.java > > Modified: > velocity/engine/branches/2.0_Exp/experimental/benchmark/Benchmark.java > URL: > http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/experimental/benchmark/Benchmark.java?rev=742852&r1=742851&r2=742852&view=diff > ============================================================================== > --- velocity/engine/branches/2.0_Exp/experimental/benchmark/Benchmark.java > (original) > +++ velocity/engine/branches/2.0_Exp/experimental/benchmark/Benchmark.java > Tue Feb 10 05:05:11 2009 > @@ -53,8 +53,9 @@ > vengine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, "true"); > //vengine.setProperty(RuntimeConstants.VM_ARGUMENTS_PASSBYVALUE, "true"); > vengine.setProperty(RuntimeConstants.VM_LIBRARY_AUTORELOAD, "false"); > - vengine.setProperty(RuntimeConstants.RESOURCE_MANAGER_DEFAULTCACHE_SIZE, > "0"); > - vengine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, "true"); > + > //vengine.setProperty(RuntimeConstants.RESOURCE_MANAGER_DEFAULTCACHE_SIZE, > "0"); > + //vengine.setProperty(RuntimeConstants.PARSER_POOL_SIZE, "0"); > + //vengine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, > "true"); > vengine.setProperty("file.resource.loader.modificationCheckInterval", > "0"); > vengine.setProperty(RuntimeConstants.VM_LIBRARY, "vmlib1.vm,vmlib2.vm"); > log("Starting " + threadCnt + " threads which will run " + runCnt + " > times"); > @@ -63,7 +64,9 @@ > { > VelocityThread vt = new VelocityThread(vengine, runCnt); > list.add(vt); > + System.out.println("Started thread: " + i); > vt.start(); > + if (i == 0) Thread.sleep(500); > } > } > } > @@ -174,7 +177,7 @@ > for (int i=0; i < len; i++) > { > buffer[i] = buf[i+off]; > - } > + } > } > > public void close() {} > > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
