src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java

*** 1,8 ****
  /*
   * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
!  * @LastModified: Oct 2017
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
--- 1,8 ----
  /*
   * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
!  * @LastModified: Nov 2017
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
*** 417,427 ****
  
          // Initialize closure variables in sortRecordFactory
          final List<VariableRefBase> dups = new ArrayList<>();
  
          for (int j = 0; j < nsorts; j++) {
!             final Sort sort = (Sort) sortObjects.get(j);
              final int length = (sort._closureVars == null) ? 0 :
                  sort._closureVars.size();
  
              for (int i = 0; i < length; i++) {
                  VariableRefBase varRef = sort._closureVars.get(i);
--- 417,427 ----
  
          // Initialize closure variables in sortRecordFactory
          final List<VariableRefBase> dups = new ArrayList<>();
  
          for (int j = 0; j < nsorts; j++) {
!             final Sort sort = sortObjects.get(j);
              final int length = (sort._closureVars == null) ? 0 :
                  sort._closureVars.size();
  
              for (int i = 0; i < length; i++) {
                  VariableRefBase varRef = sort._closureVars.get(i);
*** 551,561 ****
          il.append(new CHECKCAST(cpg.addClass(sortRecordClass)));
  
          // Initialize closure in record class
          final int ndups = dups.size();
          for (int i = 0; i < ndups; i++) {
!             final VariableRefBase varRef = (VariableRefBase) dups.get(i);
              final VariableBase var = varRef.getVariable();
              final Type varType = var.getType();
  
              il.append(DUP);
  
--- 551,561 ----
          il.append(new CHECKCAST(cpg.addClass(sortRecordClass)));
  
          // Initialize closure in record class
          final int ndups = dups.size();
          for (int i = 0; i < ndups; i++) {
!             final VariableRefBase varRef = dups.get(i);
              final VariableBase var = varRef.getVariable();
              final Type varType = var.getType();
  
              il.append(DUP);
  
*** 615,625 ****
              sort.setInnerClassName(className);
  
              final int length = (sort._closureVars == null) ? 0 :
                  sort._closureVars.size();
              for (int i = 0; i < length; i++) {
!                 final VariableRefBase varRef = (VariableRefBase) sort._closureVars.get(i);
  
                  // Discard duplicate variable references
                  if (dups.contains(varRef)) continue;
  
                  final VariableBase var = varRef.getVariable();
--- 615,625 ----
              sort.setInnerClassName(className);
  
              final int length = (sort._closureVars == null) ? 0 :
                  sort._closureVars.size();
              for (int i = 0; i < length; i++) {
!                 final VariableRefBase varRef = sort._closureVars.get(i);
  
                  // Discard duplicate variable references
                  if (dups.contains(varRef)) continue;
  
                  final VariableBase var = varRef.getVariable();