You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2014/01/01 18:29:18 UTC
svn commit: r1554653 - in
/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry:
euclidean/oned/SubOrientedPoint.java partitioning/AbstractRegion.java
Author: luc
Date: Wed Jan 1 17:29:18 2014
New Revision: 1554653
URL: http://svn.apache.org/r1554653
Log:
Avoid NullPointerException in some corner cases.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java?rev=1554653&r1=1554652&r2=1554653&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java Wed Jan 1 17:29:18 2014
@@ -46,6 +46,11 @@ public class SubOrientedPoint extends Ab
}
/** {@inheritDoc} */
+ public boolean isEmpty() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
@Override
protected AbstractSubHyperplane<Euclidean1D, Euclidean1D> buildNew(final Hyperplane<Euclidean1D> hyperplane,
final Region<Euclidean1D> remainingRegion) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java?rev=1554653&r1=1554652&r2=1554653&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java Wed Jan 1 17:29:18 2014
@@ -128,8 +128,11 @@ public abstract class AbstractRegion<S e
/** {@inheritDoc} */
public void visitLeafNode(final BSPTree<S> node) {
- node.setAttribute((node == node.getParent().getPlus()) ?
- Boolean.FALSE : Boolean.TRUE);
+ if (node.getParent() == null || node == node.getParent().getMinus()) {
+ node.setAttribute(Boolean.TRUE);
+ } else {
+ node.setAttribute(Boolean.FALSE);
+ }
}
});