ProxyFactory's not using Util.rebind

in start() method of both BaseStatefulProxyFactory and BaseStatelessProxyFactory (on line 45 in both),

ctx.rebind(jndiName, createProxy())

should be

Util.rebind(ctx, jndiName, createProxy())

Also, in stop() methods

ctx.unbind should probably be Util.unbind