Friend or boyfriend

Okay so one of my best friends just so happens to be a guy. He likes my boyfriend and all but has feelings for me. He said it once then promised to not bring It up again. I go to him all the time for advice about me and my bf and he helps. He's never tried to sabotage. My bf has been warned by someone that he shouldn't trust my friend and now he gets upset when he hears I still text him. I understand we're he's coming from but that's still my friend, but he's also my boyfriend I love very much. What do I do?