From 975b98ff3957f38980ffa67d2002d2706463bca9 Mon Sep 17 00:00:00 2001
From: "A. Abram White" <awhite@apache.org>
Date: Thu, 13 Nov 2008 21:06:48 +0000
Subject: [PATCH] Merge 690402 from 0.9.7 to 1.1.x.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.1.x@713823 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/openjpa/kernel/BrokerImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
index 4695a325d..050862043 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
@@ -1142,6 +1142,9 @@ public class BrokerImpl
             default:
                 throw new UserException(_loc.get("meta-unknownid", cls));
             }
+        } catch (IllegalArgumentException iae) {
+            throw new UserException(_loc.get("bad-id-value", val, 
+                val.getClass().getName(), cls)).setCause(iae);
         } catch (OpenJPAException ke) {
             throw ke;
         } catch (ClassCastException cce) {