Cherry picking r9623 into releases/2.2, Bump pom.xml version, and fix NPE in samples/expenses


git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.2@9624 8db76d5a-ed1c-0410-87a9-c151d255dfc7

samples/expenses/pom.xml

diff --git a/samples/expenses/pom.xml b/samples/expenses/pom.xml
index 7752829..46396ef 100644
--- a/samples/expenses/pom.xml
+++ b/samples/expenses/pom.xml
@@ -7,7 +7,7 @@
 	<version>0.1.0.BUILD-SNAPSHOT</version>
 	<name>expenses</name>
 	<properties>
-    <gwt.version>2.1.1</gwt.version>
+    <gwt.version>2.2-rc1</gwt.version>
 		<roo.version>1.1.0.RELEASE</roo.version>
 		<spring.version>3.0.3.RELEASE</spring.version>
 		<slf4j.version>1.6.1</slf4j.version>

samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java

diff --git a/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java b/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java
index db78b4d..aecf270 100644
--- a/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java
+++ b/samples/expenses/src/main/java/com/google/gwt/sample/expenses/client/ExpenseTree.java
@@ -287,6 +287,7 @@
           lastDepartment = "";
         } else if (selected instanceof EmployeeProxy) {
           lastEmployee = (EmployeeProxy) selected;
+          lastDepartment = lastEmployee.getDepartment();
         } else if (selected instanceof String) {
           lastEmployee = null;
           if (model.isAllDepartment(selected)) {