You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/05/04 22:22:14 UTC

svn commit: r1099587 - in /lucene/dev/branches/branch_3x: ./ dev-tools/eclipse/ dev-tools/maven/ lucene/ lucene/backwards/ solr/ solr/lib/

Author: yonik
Date: Wed May  4 20:22:14 2011
New Revision: 1099587

URL: http://svn.apache.org/viewvc?rev=1099587&view=rev
Log:
SOLR-2495: json parser could hang on corrupted input and fail to detect long overflow

Added:
    lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-r1099557.jar
      - copied unchanged from r1099582, lucene/dev/trunk/solr/lib/apache-solr-noggit-r1099557.jar
Removed:
    lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-r944541.jar
Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/build.xml
    lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template

Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1099587&r1=1099586&r2=1099587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Wed May  4 20:22:14 2011
@@ -94,7 +94,7 @@
 	<classpathentry kind="lib" path="lucene/contrib/icu/lib/icu4j-4_6.jar"/>
 	<classpathentry kind="lib" path="lucene/contrib/lucli/lib/jline.jar"/>
 	<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
+	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-collections-3.2.1.jar"/>

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1099587&r1=1099586&r2=1099587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Wed May  4 20:22:14 2011
@@ -720,7 +720,7 @@
                   <artifactId>solr-noggit</artifactId>
                   <version>${project.version}</version>
                   <packaging>jar</packaging>
-                  <file>solr/lib/apache-solr-noggit-r944541.jar</file>
+                  <file>solr/lib/apache-solr-noggit-r1099557.jar</file>
                 </configuration>  
               </execution>
               <execution>

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1099587&r1=1099586&r2=1099587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Wed May  4 20:22:14 2011
@@ -93,6 +93,9 @@ Bug Fixes
 * SOLR-2493: SolrQueryParser was fixed to not parse the SolrConfig DOM tree on each
   instantiation which is a huge slowdown.  (Stephane Bailliez via uschindler)
 
+* SOLR-2495: The JSON parser could hang on corrupted input and could fail
+  to detect numbers that were too large to fit in a long.  (yonik)
+
 
 Other Changes
 ----------------------

Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1099587&r1=1099586&r2=1099587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Wed May  4 20:22:14 2011
@@ -1019,7 +1019,7 @@
                                    jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
 
       <m2-deploy-with-pom-template pom.xml="lib/apache-solr-noggit-pom.xml.template"
-                                   jar.file="lib/apache-solr-noggit-r944541.jar" />
+                                   jar.file="lib/apache-solr-noggit-r1099557.jar" />
       
       <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template"
                                    jar.file="contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar" />

Modified: lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template?rev=1099587&r1=1099586&r2=1099587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template Wed May  4 20:22:14 2011
@@ -31,6 +31,6 @@
   <artifactId>solr-noggit</artifactId>
   <name>Solr Specific Noggit</name>
   <version>@version@</version>
-  <description>Solr Specific Noggit r944541</description>
+  <description>Solr Specific Noggit r1099557</description>
   <packaging>jar</packaging>
 </project>