Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/CbcThread.cpp

    • Property svn:eol-style set to native
    r1888 r1902  
    11271127            if (thisModel->parallelMode() >= 0) {
    11281128                CbcNode * node = stuff->node();
    1129                 assert (node->nodeInfo());
     1129                //assert (node->nodeInfo());
    11301130                CbcNode * createdNode = stuff->createdNode();
    1131                 thisModel->doOneNode(baseModel, node, createdNode);
     1131                // try and see if this has slipped through
     1132                if (node) {
     1133                  thisModel->doOneNode(baseModel, node, createdNode);
     1134                } else {
     1135                  //printf("null node\n");
     1136                  createdNode=NULL;
     1137                }
    11321138                stuff->setNode(node);
    11331139                stuff->setCreatedNode(createdNode);
Note: See TracChangeset for help on using the changeset viewer.