src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java

*** 568,578 ****
              if (accept(comp)) {
                  return comp;
              } else if (comp instanceof Container && comp != aContainer) {
                  Container cont = (Container)comp;
                  if (cont.isFocusTraversalPolicyProvider()) {
!                     return cont.getFocusTraversalPolicy().getLastComponent(cont);
                  }
              }
          }
          return null;
      }
--- 568,581 ----
              if (accept(comp)) {
                  return comp;
              } else if (comp instanceof Container && comp != aContainer) {
                  Container cont = (Container)comp;
                  if (cont.isFocusTraversalPolicyProvider()) {
!                     Component retComp = cont.getFocusTraversalPolicy().getLastComponent(cont);
!                     if (retComp != null) {
!                         return retComp;
!                     }
                  }
              }
          }
          return null;
      }