Revision: 1481
http://stripes.svn.sourceforge.net/stripes/?rev=1481&view=rev
Author: bengunter
Date: 2012-03-14 18:47:29 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Applied a NPE fix from trunk r1480
Revision Links:
--------------
http://stripes.svn.sourceforge.net/stripes/?rev=1480&view=rev
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/integration/spring/SpringHelper.java
Property Changed:
----------------
branches/1.5.x/
Property changes on: branches/1.5.x
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.x:1091
+ /branches/1.5.x:1091
/trunk:1480
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/integration/spring/SpringHelper.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/integration/spring/SpringHelper.java
2012-03-14 18:45:31 UTC (rev 1480)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/integration/spring/SpringHelper.java
2012-03-14 18:47:29 UTC (rev 1481)
@@ -255,9 +255,11 @@
boolean allowFindByType) {
// First try to lookup using the name provided
try {
- Object bean = ctx.getBean(name, type);
- log.debug("Found spring bean with name [", name, "] and type [",
- bean.getClass().getName(), "]");
+ Object bean = ctx.getBean(name, type);
+ if (bean != null) {
+ log.debug("Found spring bean with name [", name, "] and type
[", bean.getClass()
+ .getName(), "]");
+ }
return bean;
}
catch (NestedRuntimeException nre) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
