You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mb...@apache.org on 2007/02/27 16:35:30 UTC
svn commit: r512283 - in
/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri:
compiler/ExpressionPath.java model/dom/DOMNodePointer.java
Author: mbenson
Date: Tue Feb 27 07:35:26 2007
New Revision: 512283
URL: http://svn.apache.org/viewvc?view=rev&rev=512283
Log:
fix broken nightlies that compile file on JDK 5 but not below due to my excessive fascination with the ternary operator. :|
Modified:
jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java
jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java?view=diff&rev=512283&r1=512282&r2=512283
==============================================================================
--- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java (original)
+++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java Tue Feb 27 07:35:26 2007
@@ -180,6 +180,7 @@
context = new PredicateContext(context, predicates[j]);
}
}
- return firstMatch ? getSingleNodePointerForSteps(context) : evalSteps(context);
+ return firstMatch ? (Object) getSingleNodePointerForSteps(context)
+ : evalSteps(context);
}
-}
\ No newline at end of file
+}
Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java?view=diff&rev=512283&r1=512282&r2=512283
==============================================================================
--- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java (original)
+++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java Tue Feb 27 07:35:26 2007
@@ -668,7 +668,7 @@
Document document = node.getNodeType() == Node.DOCUMENT_NODE ? (Document) node
: node.getOwnerDocument();
Element element = document.getElementById(id);
- return element == null ? new NullPointer(getLocale(), id)
+ return element == null ? (Pointer) new NullPointer(getLocale(), id)
: new DOMNodePointer(element, getLocale(), id);
}
@@ -727,4 +727,4 @@
}
return 0;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: svn commit: r512283 - in /jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri: compiler/ExpressionPath.java model/dom/DOMNodePointer.java
Posted by Matt Benson <gu...@yahoo.com>.
Thanks sebb! I was reading the online svn book and it
said an admin had to do it, but sure enough --revprop
propset svn:log seems to do the trick! ;)
-Matt
--- sebb <se...@gmail.com> wrote:
> On 27/02/07, Matt Benson <gu...@yahoo.com>
> wrote:
> > --- mbenson@apache.org wrote:
> >
> > > Author: mbenson
> > > Date: Tue Feb 27 07:35:26 2007
> > > New Revision: 512283
> > >
> > > URL:
> > > http://svn.apache.org/viewvc?view=rev&rev=512283
> > > Log:
> > > fix broken nightlies that compile file on JDK 5
> but
> > > not below due to my excessive fascination with
> the
> > > ternary operator. :|
> >
> > Er, "compile fine", and "A poor workman blames his
> > tools." ;)
> >
>
> BTW, SVN allows one to change the log comment ;-)
>
> S.
>
>
---------------------------------------------------------------------
> To unsubscribe, e-mail:
> commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail:
> commons-dev-help@jakarta.apache.org
>
>
____________________________________________________________________________________
Food fight? Enjoy some healthy debate
in the Yahoo! Answers Food & Drink Q&A.
http://answers.yahoo.com/dir/?link=list&sid=396545367
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: svn commit: r512283 - in /jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri: compiler/ExpressionPath.java model/dom/DOMNodePointer.java
Posted by sebb <se...@gmail.com>.
On 27/02/07, Matt Benson <gu...@yahoo.com> wrote:
> --- mbenson@apache.org wrote:
>
> > Author: mbenson
> > Date: Tue Feb 27 07:35:26 2007
> > New Revision: 512283
> >
> > URL:
> > http://svn.apache.org/viewvc?view=rev&rev=512283
> > Log:
> > fix broken nightlies that compile file on JDK 5 but
> > not below due to my excessive fascination with the
> > ternary operator. :|
>
> Er, "compile fine", and "A poor workman blames his
> tools." ;)
>
BTW, SVN allows one to change the log comment ;-)
S.
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: svn commit: r512283 - in /jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri: compiler/ExpressionPath.java model/dom/DOMNodePointer.java
Posted by Matt Benson <gu...@yahoo.com>.
--- mbenson@apache.org wrote:
> Author: mbenson
> Date: Tue Feb 27 07:35:26 2007
> New Revision: 512283
>
> URL:
> http://svn.apache.org/viewvc?view=rev&rev=512283
> Log:
> fix broken nightlies that compile file on JDK 5 but
> not below due to my excessive fascination with the
> ternary operator. :|
Er, "compile fine", and "A poor workman blames his
tools." ;)
-Matt
>
> Modified:
>
>
jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java
>
>
jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
>
[SNIP]
____________________________________________________________________________________
Be a PS3 game guru.
Get your game face on with the latest PS3 news and previews at Yahoo! Games.
http://videogames.yahoo.com/platform?platform=120121
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org