tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Thomas <ma...@apache.org>
Subject Re: svn commit: r1099394 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Date Wed, 04 May 2011 10:35:28 GMT
On 04/05/2011 11:30, Konstantin Kolinko wrote:
> 2011/5/4  <markt@apache.org>:
>> Author: markt
>> Date: Wed May  4 10:14:19 2011
>> New Revision: 1099394
>>
>> URL: http://svn.apache.org/viewvc?rev=1099394&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51135
>> Fix auto-detection of JAVA_HOME for 64-bit Windows platforms that only have a 32-bit
JVM installed.
>>
>> Modified:
>>    tomcat/trunk/res/tomcat.nsi
>>    tomcat/trunk/webapps/docs/changelog.xml
>>
>> Modified: tomcat/trunk/res/tomcat.nsi
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1099394&r1=1099393&r2=1099394&view=diff
>> ==============================================================================
>> --- tomcat/trunk/res/tomcat.nsi (original)
>> +++ tomcat/trunk/res/tomcat.nsi Wed May  4 10:14:19 2011
>> @@ -635,22 +635,35 @@ Function findJavaHome
>>
>>   ClearErrors
> 
> StrCpy $1 ""
> 
> Add the above line here as well, to initialize $1 when running with
> 32-bit. That is because you are checking ${If} $1 == "" below, but the
> initial value of $1 is not known.

Testing shows it isn't necessary but I agree adding it on the basis of
better safe than sorry is a good idea.

Mark



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message