Author: jeremias
Date: Mon Mar 17 05:35:26 2008
New Revision: 637859
URL: http://svn.apache.org/viewvc?rev=637859&view=rev
Log:
Throw a meaningful exception when the property name is wrong. Otherwise, there
will be an ArrayIndexOutOfBoundsException.
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/FromParentFunction.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/FromParentFunction.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/FromParentFunction.java?rev=637859&r1=637858&r2=637859&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/FromParentFunction.java
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/FromParentFunction.java
Mon Mar 17 05:35:26 2008
@@ -64,7 +64,13 @@
* non-inherited properties too. Perhaps the result is different for
* a property line line-height which "inherits specified"???
*/
- return
pInfo.getPropertyList().getFromParent(FOPropertyMapping.getPropertyId(propName));
+ int propId = FOPropertyMapping.getPropertyId(propName);
+ if (propId < 0) {
+ throw new PropertyException(
+ "Unknown property name used with inherited-property-value
function: "
+ + propName);
+ }
+ return pInfo.getPropertyList().getFromParent(propId);
}
}
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java?rev=637859&r1=637858&r2=637859&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
Mon Mar 17 05:35:26 2008
@@ -60,6 +60,11 @@
// NOTE: special cases for shorthand property
// Should return COMPUTED VALUE
int propId = FOPropertyMapping.getPropertyId(propName);
+ if (propId < 0) {
+ throw new PropertyException(
+ "Unknown property name used with inherited-property-value
function: "
+ + propName);
+ }
return pInfo.getPropertyList().getNearestSpecified(propId);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
