test issue

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902894 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 1ce3b03d53ae5cf1826bdda48077c1cbf7488923..deed5b68d2e589e00613cae2faa9a99c6be7b0ad 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -1278,7 +1278,11 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
     @Deprecated
     @Removal(version = "7.0.0")
     public void setMargin(short margin, double size) {
-        setMargin(PageMargin.getByShortValue(margin), size);
+        final PageMargin pageMargin = PageMargin.getByShortValue(margin);
+        if (pageMargin == null) {
+            throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
+        }
+        setMargin(pageMargin, size);
     }
 
     /**
@@ -1311,7 +1315,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
             case FOOTER:
                 pageMargins.setFooter(size);
                 break;
-            default :
+            default:
                 throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
         }
     }

diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index c94c35e6e83823e665d6abede943cadd550c1f32..4a48d6fc215b6b157ecd2a9a0c71d9eef1d7d9a9 100644 (file)
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -1355,7 +1355,11 @@ public final class HSSFSheet implements Sheet {
     @Deprecated
     @Removal(version = "7.0.0")
     public void setMargin(short margin, double size) {
-        setMargin(PageMargin.getByShortValue(margin), size);
+        final PageMargin pageMargin = PageMargin.getByShortValue(margin);
+        if (pageMargin == null) {
+            throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
+        }
+        setMargin(pageMargin, size);
     }
 
     /**