src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java

*** 502,512 ****
                  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;
--- 502,515 ----
                  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;