You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Robert Muir <rc...@gmail.com> on 2011/11/25 19:03:48 UTC
Re: svn commit: r1206262 - /lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
My mistake... thanks Yonik
On Fri, Nov 25, 2011 at 12:08 PM, <yo...@apache.org> wrote:
> Author: yonik
> Date: Fri Nov 25 17:08:33 2011
> New Revision: 1206262
>
> URL: http://svn.apache.org/viewvc?rev=1206262&view=rev
> Log:
> LUCENE-3590: fix solr breakage due to bytesref changes
>
> Modified:
> lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
>
> Modified: lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp?rev=1206262&r1=1206261&r2=1206262&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp (original)
> +++ lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp Fri Nov 25 17:08:33 2011
> @@ -159,7 +159,7 @@
> final BytesRef bytes = bytesAtt.getBytesRef();
> while (tstream.incrementToken()) {
> bytesAtt.fillBytesRef();
> - matches.add(new BytesRef(bytes));
> + matches.add(BytesRef.deepCopyOf(bytes));
> }
> }
>
> @@ -282,12 +282,12 @@
> Tok(AttributeSource token, int pos, FieldType ft) {
> this.pos = pos;
> TermToBytesRefAttribute termAtt = token.getAttribute(TermToBytesRefAttribute.class);
> - BytesRef spare = termAtt.getBytesRef();
> - termAtt.fillBytesRef();
> - bytes = new BytesRef(spare);
> + BytesRef termBytes = termAtt.getBytesRef();
> + termAtt.fillBytesRef();
> + bytes = BytesRef.deepCopyOf(termBytes);
> + text = ft.indexedToReadable(bytes, new CharsRef()).toString();
> rawText = (token.hasAttribute(CharTermAttribute.class)) ?
> token.getAttribute(CharTermAttribute.class).toString() : null;
> - text = ft.indexedToReadable(bytes, new CharsRef()).toString();
> token.reflectWith(new AttributeReflector() {
> public void reflect(Class<? extends Attribute> attClass, String key, Object value) {
> // leave out position and raw term
>
>
>
--
lucidimagination.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
RE: svn commit: r1206262 - /lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
Posted by Uwe Schindler <uw...@thetaphi.de>.
I also fixed the test-jsp target to be actually called by Jenkins, since the rewrite of the build system this was incorrect (it's a test task and no compile task). So the compilation errors are found before actually testing the JSP in jetty.
-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de
> -----Original Message-----
> From: Robert Muir [mailto:rcmuir@gmail.com]
> Sent: Friday, November 25, 2011 7:04 PM
> To: dev@lucene.apache.org
> Subject: Re: svn commit: r1206262 -
> /lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
>
> My mistake... thanks Yonik
>
> On Fri, Nov 25, 2011 at 12:08 PM, <yo...@apache.org> wrote:
> > Author: yonik
> > Date: Fri Nov 25 17:08:33 2011
> > New Revision: 1206262
> >
> > URL: http://svn.apache.org/viewvc?rev=1206262&view=rev
> > Log:
> > LUCENE-3590: fix solr breakage due to bytesref changes
> >
> > Modified:
> > lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
> >
> > Modified: lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp
> > URL:
> > http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/admin/an
> > alysis.jsp?rev=1206262&r1=1206261&r2=1206262&view=diff
> >
> ================================================================
> ======
> > ========
> > --- lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp (original)
> > +++ lucene/dev/trunk/solr/webapp/web/admin/analysis.jsp Fri Nov 25
> > +++ 17:08:33 2011
> > @@ -159,7 +159,7 @@
> > final BytesRef bytes = bytesAtt.getBytesRef();
> > while (tstream.incrementToken()) {
> > bytesAtt.fillBytesRef();
> > - matches.add(new BytesRef(bytes));
> > + matches.add(BytesRef.deepCopyOf(bytes));
> > }
> > }
> >
> > @@ -282,12 +282,12 @@
> > Tok(AttributeSource token, int pos, FieldType ft) {
> > this.pos = pos;
> > TermToBytesRefAttribute termAtt =
> > token.getAttribute(TermToBytesRefAttribute.class);
> > - BytesRef spare = termAtt.getBytesRef();
> > - termAtt.fillBytesRef();
> > - bytes = new BytesRef(spare);
> > + BytesRef termBytes = termAtt.getBytesRef();
> > + termAtt.fillBytesRef();
> > + bytes = BytesRef.deepCopyOf(termBytes);
> > + text = ft.indexedToReadable(bytes, new CharsRef()).toString();
> > rawText = (token.hasAttribute(CharTermAttribute.class)) ?
> > token.getAttribute(CharTermAttribute.class).toString() : null;
> > - text = ft.indexedToReadable(bytes, new CharsRef()).toString();
> > token.reflectWith(new AttributeReflector() {
> > public void reflect(Class<? extends Attribute> attClass,
> > String key, Object value) {
> > // leave out position and raw term
> >
> >
> >
>
>
>
> --
> lucidimagination.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional
> commands, e-mail: dev-help@lucene.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org