db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jack Klebanoff <kleba...@Mutagen.Net>
Subject Re: svn commit: rev 53834 - incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort
Date Wed, 06 Oct 2004 16:23:49 GMT
I apologize. The patch checked into Subversion is correct. I am new to 
Subversion. I mistook conflict markers inserted by Subversion for the 
real contents of a file. (Svn update was run by a script, so I did not 
realize what happened).

Jack
Jack Klebanoff wrote:

> mikem@apache.org wrote:
>
>> Author: mikem
>> Date: Tue Oct  5 16:43:37 2004
>> New Revision: 53834
>>
>> Modified:
>>   
>> incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java

>>
>> Log:
>> committing for klebanof@Mutagen.Net
>>
>> Class org.apache.derby.impl.store.access.sort.ExternalSortFactory has 
>> a latent bug. Its canSupport method throws an exception if it is 
>> called with a null startParams argument.
>>
>>
>>
>> Modified: 
>> incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java

>>
>> ============================================================================== 
>>
>> --- 
>> incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
   
>> (original)
>> +++ 
>> incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
   
>> Tue Oct  5 16:43:37 2004
>> @@ -322,6 +322,9 @@
>>
>>     public boolean canSupport(Properties startParams) {
>>
>> +        if (startParams == null)
>> +            return false; +
>>         String impl = 
>> startParams.getProperty("derby.access.Conglomerate.type");
>>         if (impl == null)
>>             return false;
>>
>>  
>>
> It looks like the patch program did not do what you wanted. The source 
> that I got from Subversion contains:
>
> <<<<<<< .mine
>        if( startParams == null)
>            return false;
> =======
>        if (startParams == null)
>            return false;
>
> >>>>>>> .r53839
>
> The Java compiler does not like "<<<<<<< .mine", etc. :-)
>
> Jack
>


Mime
View raw message