From: Josh Micich <josh@apache.org>
Date: Wed, 26 Nov 2008 22:00:29 +0000 (+0000)
Subject: fixed NPE in HyperlinkRecord.toString()
X-Git-Tag: REL_3_5_BETA5~85
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=65d9d900b92ea59e6a8fd5cbe93d19004df7d05a;p=poi.git

fixed NPE in HyperlinkRecord.toString()

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

diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
index 38f9855068..46c84b5e22 100644
--- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
@@ -628,7 +628,7 @@ public final class HyperlinkRecord extends StandardRecord {
         if ((_linkOpts & HLINK_TARGET_FRAME) != 0) {
             buffer.append("    .targetFrame= ").append(getTargetFrame()).append("\n");
         }
-        if((_linkOpts & HLINK_URL) != 0) {
+        if((_linkOpts & HLINK_URL) != 0 && _moniker != null) {
             buffer.append("    .moniker   = ").append(_moniker.formatAsString()).append("\n");
         }
         if ((_linkOpts & HLINK_PLACE) != 0) {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
index 60cccf9a48..7bb05f4f12 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
@@ -435,6 +435,11 @@ public final class TestHyperlinkRecord extends TestCase {
 		HyperlinkRecord hr = new HyperlinkRecord(in);
 		byte[] ser = hr.serialize();
 		TestcaseRecordInputStream.confirmRecordEncoding(HyperlinkRecord.sid, dataUNC, ser);
+		try {
+			hr.toString();
+		} catch (NullPointerException e) {
+			throw new AssertionFailedError("Identified bug with option URL and UNC set at same time");
+		}
 	}
 	
 	public void testGUID() {