From 24f1a15d077d64fda3b6f26ecb1f712a86556891 Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Thu, 16 May 2013 11:46:04 -0400
Subject: [PATCH] HHH-8238 OsgiJtaPlatform null pointer exception

---
 .../src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java
index 5dd4888037..c79318c3a5 100644
--- a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java
+++ b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java
@@ -54,13 +54,13 @@ public OsgiJtaPlatform(BundleContext bundleContext) {
 	@Override
 	public TransactionManager retrieveTransactionManager() {
 		final ServiceReference sr = bundleContext.getServiceReference( TransactionManager.class.getName() );
-		return (TransactionManager) bundleContext.getService( sr );
+		return sr == null ? null : (TransactionManager) bundleContext.getService( sr );
 	}
 
 	@Override
 	public UserTransaction retrieveUserTransaction() {
 		final ServiceReference sr = bundleContext.getServiceReference( UserTransaction.class.getName() );
-		return (UserTransaction) bundleContext.getService( sr );
+		return sr == null ? null : (UserTransaction) bundleContext.getService( sr );
 	}
 
 	@Override